X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FAbstractSoneCommand.java;h=98a43ab95734e851b647d6d862f4aa2ff713f63d;hp=1c4fd2efdbebbf1a9057ecdb529469e6bfa3b3f4;hb=ffd92ca2374c0b2218e583d02e0bdd24b8c110ae;hpb=284a781c6d0539232763ea572854d44a62241863 diff --git a/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java b/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java index 1c4fd2e..98a43ab 100644 --- a/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java +++ b/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java @@ -237,6 +237,7 @@ public abstract class AbstractSoneCommand extends AbstractCommand { protected static SimpleFieldSet encodeSone(Sone sone, String prefix, Optional localSone) { SimpleFieldSetBuilder soneBuilder = new SimpleFieldSetBuilder(); + soneBuilder.put(prefix + "ID", sone.getId()); soneBuilder.put(prefix + "Name", sone.getName()); soneBuilder.put(prefix + "NiceName", SoneAccessor.getNiceName(sone)); soneBuilder.put(prefix + "LastUpdated", sone.getTime()); @@ -272,10 +273,7 @@ public abstract class AbstractSoneCommand extends AbstractCommand { soneBuilder.put(prefix + "Count", sones.size()); for (Sone sone : sones) { String sonePrefix = prefix + soneIndex++ + "."; - soneBuilder.put(sonePrefix + "ID", sone.getId()); - soneBuilder.put(sonePrefix + "Name", sone.getName()); - soneBuilder.put(sonePrefix + "NiceName", SoneAccessor.getNiceName(sone)); - soneBuilder.put(sonePrefix + "Time", sone.getTime()); + soneBuilder.put(encodeSone(sone, sonePrefix, Optional.absent())); } return soneBuilder.get();