X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FProfileAccessor.java;h=366e071fde61c4143452351574b918035957638e;hb=85aa9c556ef8ac726694f0077a4f8df0bc912e5f;hp=36fa42de08ab3fb2a272e6703ee1155ced59721f;hpb=62b87298ae2752c18e8152879b55f107b3fde66b;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java b/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
index 36fa42d..366e071 100644
--- a/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
@@ -61,11 +61,12 @@ public class ProfileAccessor extends ReflectionAccessor {
 				return null;
 			}
 			String avatarId = profile.getAvatar();
-			if (avatarId != null) {
-				if (core.getImage(avatarId, false) == null) {
-					/* avatar ID but no matching image? show nothing. */
-					return null;
-				}
+			if (avatarId == null) {
+				return null;
+			}
+			if (core.getImage(avatarId, false) == null) {
+				/* avatar ID but no matching image? show nothing. */
+				return null;
 			}
 			Sone remoteSone = profile.getSone();
 			if (core.isLocalSone(remoteSone)) {
@@ -76,11 +77,11 @@ public class ProfileAccessor extends ReflectionAccessor {
 			if (showCustomAvatars == ShowCustomAvatars.NEVER) {
 				return null;
 			}
-			if ((showCustomAvatars == ShowCustomAvatars.ALWAYS) || (avatarId == null)) {
+			if (showCustomAvatars == ShowCustomAvatars.ALWAYS) {
 				return avatarId;
 			}
-			if ((showCustomAvatars == ShowCustomAvatars.FOLLOWED) && currentSone.hasFriend(remoteSone.getId())) {
-				return avatarId;
+			if (showCustomAvatars == ShowCustomAvatars.FOLLOWED) {
+				return currentSone.hasFriend(remoteSone.getId()) ? avatarId : null;
 			}
 			Trust trust = core.getTrust(currentSone, remoteSone);
 			if (trust == null) {