X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FProfileAccessor.java;h=1f29b65c02d67b9cf46ace175da4bfe04b78d135;hb=480691a26222e035e53bda56029524e160fdf898;hp=05857cf6471bb778062f83c99cfc7206ee7bec05;hpb=5d4c3c06473b17a7479129a9538c3917dc98890f;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 05857cf..1f29b65 100644
--- a/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Sone - ProfileAccessor.java - Copyright © 2011 David Roden
+ * Sone - ProfileAccessor.java - Copyright © 2011–2012 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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,7 +77,7 @@ 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) {