X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FSoneAccessor.java;h=e02396ad53c98aed008ce974b62d1cadf64a6c59;hb=1e98aa576d202b93784e7843ec5458832e713977;hp=ebf2f82a7ad25129270694ff9c5a30ee25a901ba;hpb=21c4819261de874652e7c8be37bde5923758cf4b;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 ebf2f82..e02396a 100644 --- a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java +++ b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java @@ -65,19 +65,18 @@ public class SoneAccessor extends ReflectionAccessor { Sone sone = (Sone) object; if (member.equals("niceName")) { return getNiceName(sone); + } else if (member.equals("local")) { + return sone.getInsertUri() != null; } 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); - } else if (member.equals("blocked")) { - Sone currentSone = (Sone) dataProvider.getData("currentSone"); - return currentSone.isSoneBlocked(sone.getId()); + return (currentSone != null) && currentSone.equals(sone); } else if (member.equals("modified")) { return sone.getModificationCounter() > 0; } else if (member.equals("status")) { - return core.getSoneStatus(sone).toString(); + return core.getSoneStatus(sone); } else if (member.equals("unknown")) { return core.getSoneStatus(sone) == SoneStatus.unknown; } else if (member.equals("idle")) {