X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FSoneAccessor.java;h=a21794dfe70f62bde4159290419a37c419a03836;hb=0dc8ce4308f55d8f13e41c7ac312c11a379418b9;hp=f1ee6e545f94fec621f082a66dcbde6717c61498;hpb=4623504d164c0f3cf870f1b5c5707fb058657e71;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 f1ee6e5..a21794d 100644 --- a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java +++ b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java @@ -73,13 +73,10 @@ public class SoneAccessor extends ReflectionAccessor { } else if (member.equals("current")) { Sone currentSone = (Sone) dataProvider.getData("currentSone"); return (currentSone != null) && currentSone.equals(sone); - } else if (member.equals("blocked")) { - Sone currentSone = (Sone) dataProvider.getData("currentSone"); - 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(); + return core.getSoneStatus(sone); } else if (member.equals("unknown")) { return core.getSoneStatus(sone) == SoneStatus.unknown; } else if (member.equals("idle")) { @@ -110,7 +107,7 @@ public class SoneAccessor extends ReflectionAccessor { String lastName = profile.getLastName(); if (firstName == null) { if (lastName == null) { - return sone.getName(); + return String.valueOf(sone.getName()); } return lastName; }