X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FSoneAccessor.java;h=60e2e9be7312972ffcdf4aa0a5a978709009b0b4;hb=bfd736257727d95e55d85c6fa05982b481776196;hp=e22738aa1f05b9d48ed44e27b125742e3ea7ca30;hpb=b1660609f6574ed43afd61d332be9f3764900405;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
index e22738a..60e2e9b 100644
--- a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
@@ -67,17 +67,19 @@ public class SoneAccessor extends ReflectionAccessor {
 			return getNiceName(sone);
 		} else if (member.equals("friend")) {
 			Sone currentSone = (Sone) dataProvider.getData("currentSone");
-			return currentSone.hasFriend(sone) ? true : null;
+			return (currentSone != null) && currentSone.hasFriend(sone);
 		} else if (member.equals("current")) {
 			Sone currentSone = (Sone) dataProvider.getData("currentSone");
-			return currentSone.equals(sone);
+			return (currentSone != null) && currentSone.equals(sone);
 		} else if (member.equals("blocked")) {
 			Sone currentSone = (Sone) dataProvider.getData("currentSone");
-			return currentSone.isSoneBlocked(sone.getId());
+			return (currentSone != null) && currentSone.isSoneBlocked(sone.getId());
 		} else if (member.equals("modified")) {
 			return sone.getModificationCounter() > 0;
 		} else if (member.equals("status")) {
 			return core.getSoneStatus(sone).toString();
+		} else if (member.equals("unknown")) {
+			return core.getSoneStatus(sone) == SoneStatus.unknown;
 		} else if (member.equals("idle")) {
 			return core.getSoneStatus(sone) == SoneStatus.idle;
 		} else if (member.equals("inserting")) {