X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=9d7ca826421ee9afcc64090e2d6b1e1a32734b33;hp=e36a3063f2d1ba37e7bea1e24f3edfe903079a28;hb=63df577f7ced52acfa93e4a7f329292069d8ba9d;hpb=c513e3329a397d0ebc17fe672f41c7d9d21122c7 diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java index e36a306..9d7ca82 100644 --- a/src/main/java/net/pterodactylus/sone/data/Sone.java +++ b/src/main/java/net/pterodactylus/sone/data/Sone.java @@ -147,7 +147,7 @@ public class Sone implements Fingerprintable, Comparable { private volatile long time; /** The profile of this Sone. */ - private volatile Profile profile = new Profile(); + private volatile Profile profile = new Profile(this); /** The client used by the Sone. */ private volatile Client client; @@ -173,9 +173,6 @@ public class Sone implements Fingerprintable, Comparable { /** Sone-specific options. */ private final Options options = new Options(); - /** The avatar of this Sone. */ - private volatile String avatar; - /** * Creates a new Sone. * @@ -767,34 +764,6 @@ public class Sone implements Fingerprintable, Comparable { } /** - * Returns the ID of the currently selected avatar image. - * - * @return The ID of the currently selected avatar image, or {@code null} if - * no avatar is selected. - */ - public String getAvatar() { - return avatar; - } - - /** - * Sets the avatar image. - * - * @param avatar - * The new avatar image, or {@code null} to not select an avatar - * image. - * @return This Sone - */ - public Sone setAvatar(Image avatar) { - if (avatar == null) { - this.avatar = null; - return this; - } - Validation.begin().isEqual("Image Owner", avatar.getSone(), this).check(); - this.avatar = avatar.getId(); - return this; - } - - /** * Returns Sone-specific options. * * @return The options of this Sone @@ -851,8 +820,6 @@ public class Sone implements Fingerprintable, Comparable { } fingerprint.append(')'); - fingerprint.append("Avatar(").append(avatar).append(')'); - return fingerprint.toString(); }