Don’t crash when not logged in.

[Sone.git] / src / main / java / net / pterodactylus / sone / template / SoneAccessor.java

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 (file)
--- 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")) {