X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FProfileAccessor.java;h=7362179861d29e831bbfdb8100cd7b1a1eaa4a0c;hb=18a45f362d69085b12fe3028e9320578e10cc968;hp=f004967868117ee9ccc9b0139e0a0372692a3984;hpb=d9bf6bfb76e9f59c9b2364af44902e5d1210168f;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 f004967..7362179 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–2012 David Roden
+ * Sone - ProfileAccessor.java - Copyright © 2011–2016 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
@@ -20,7 +20,7 @@ package net.pterodactylus.sone.template;
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.data.Profile;
 import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.data.Sone.ShowCustomAvatars;
+import net.pterodactylus.sone.data.SoneOptions.ShowCustomAvatars;
 import net.pterodactylus.sone.freenet.wot.OwnIdentity;
 import net.pterodactylus.sone.freenet.wot.Trust;
 import net.pterodactylus.util.template.Accessor;
@@ -70,11 +70,11 @@ public class ProfileAccessor extends ReflectionAccessor {
 				return null;
 			}
 			Sone remoteSone = profile.getSone();
-			if (core.isLocalSone(remoteSone)) {
+			if (remoteSone.isLocal()) {
 				/* always show your own avatars. */
 				return avatarId;
 			}
-			ShowCustomAvatars showCustomAvatars = currentSone.getOptions().<ShowCustomAvatars> getEnumOption("ShowCustomAvatars").get();
+			ShowCustomAvatars showCustomAvatars = currentSone.getOptions().getShowCustomAvatars();
 			if (showCustomAvatars == ShowCustomAvatars.NEVER) {
 				return null;
 			}