Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix new command trait persistence

This commit is contained in:
fullwall 2019-10-01 14:16:00 +08:00
parent dabe4bb43e
commit 95e9aa1389
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main/src/main/java/net/citizensnpcs/commands/AdminCommands.java
View File

@ -23,8 +23,7 @@ public class AdminCommands {
@Command(aliases = { "citizens" }, desc = "Show basic plugin information", max = 0, permission = "citizens.admin")
public void citizens(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
Messaging.send(sender,
" " + StringHelper.wrapHeader("<e>Citizens v" + plugin.getDescription().getVersion()));
Messaging.send(sender, StringHelper.wrapHeader("<e>Citizens v" + plugin.getDescription().getVersion()));
Messaging.send(sender, " <7>-- <c>Author: fullwall");
Messaging.send(sender, " <7>-- <c>Source Code: http://github.com/CitizensDev");
Messaging.send(sender, " <7>-- <c>Website: " + plugin.getDescription().getWebsite());

9
main/src/main/java/net/citizensnpcs/trait/CommandTrait.java
View File

@ -11,8 +11,8 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.api.persistence.DelegatePersistence;
import net.citizensnpcs.api.persistence.Persist;
import net.citizensnpcs.api.persistence.PersistenceLoader;
import net.citizensnpcs.api.persistence.Persister;
import net.citizensnpcs.api.trait.Trait;
import net.citizensnpcs.api.trait.TraitName;
@ -23,6 +23,7 @@ import net.citizensnpcs.util.Messages;
@TraitName("commandtrait")
public class CommandTrait extends Trait {
@Persist
@DelegatePersistence(NPCCommandPersister.class)
private final Map<String, NPCCommand> commands = Maps.newHashMap();
public CommandTrait() {
@ -91,7 +92,7 @@ public class CommandTrait extends Trait {
commands.remove(String.valueOf(id));
}
public enum Hand {
public static enum Hand {
LEFT,
RIGHT;
}
@ -128,8 +129,4 @@ public class CommandTrait extends Trait {
root.setString("hand", instance.hand.name());
}
}
static {
PersistenceLoader.registerPersistDelegate(NPCCommand.class, NPCCommandPersister.class);
}
}