X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FProfileAccessor.java;h=8c7d1e4b8bd25e0502d501d2a4badd527bc42a8a;hp=f6056fadb0f197b7b48a8da984d3354bed4e0443;hb=87b2b8dc5a94c2af3cee7a91c122a7240044cddf;hpb=0e3f55050a9a077723d0a355764bd7cf6ffa1860

diff --git a/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java b/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
index f6056fa..8c7d1e4 100644
--- a/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
@@ -60,19 +60,25 @@ public class ProfileAccessor extends ReflectionAccessor {
 				/* not logged in? don’t show custom avatars, then. */
 				return null;
 			}
-			if (profile.getSone().equals(currentSone)) {
-				/* always show your own avatar. */
-				return profile.getAvatar();
+			String avatarId = profile.getAvatar();
+			if (avatarId != 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)) {
+				/* always show your own avatars. */
+				return avatarId;
 			}
 			ShowCustomAvatars showCustomAvatars = currentSone.getOptions().<ShowCustomAvatars> getEnumOption("ShowCustomAvatars").get();
 			if (showCustomAvatars == ShowCustomAvatars.NEVER) {
 				return null;
 			}
-			String avatarId = profile.getAvatar();
 			if ((showCustomAvatars == ShowCustomAvatars.ALWAYS) || (avatarId == null)) {
 				return avatarId;
 			}
-			Sone remoteSone = profile.getSone();
 			if ((showCustomAvatars == ShowCustomAvatars.FOLLOWED) && currentSone.hasFriend(remoteSone.getId())) {
 				return avatarId;
 			}