From bbf1fcb40ea8ab2e471193ad317309d1556c295c Mon Sep 17 00:00:00 2001 From: fullwall Date: Wed, 24 Oct 2012 00:19:31 +0800 Subject: [PATCH] Fix an issue with Gravity --- .../java/net/citizensnpcs/command/command/NPCCommands.java | 5 +++-- src/main/java/net/citizensnpcs/trait/Gravity.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/citizensnpcs/command/command/NPCCommands.java b/src/main/java/net/citizensnpcs/command/command/NPCCommands.java index a0b213e1d..e46954f24 100644 --- a/src/main/java/net/citizensnpcs/command/command/NPCCommands.java +++ b/src/main/java/net/citizensnpcs/command/command/NPCCommands.java @@ -289,8 +289,9 @@ public class NPCCommands { } } - if (args.hasValueFlag("b")) { - npc.getTrait(Behaviour.class).addScripts(Splitter.on(",").split(args.getFlag("behaviour"))); + if (args.hasValueFlag("b") || args.hasValueFlag("behaviours") || args.hasValueFlag("behaviors")) { + String behaviours = args.getFlag("b", args.getFlag("behaviours", args.getFlag("behaviors"))); + npc.getTrait(Behaviour.class).addScripts(Splitter.on(',').split(behaviours)); msg += " with the specified behaviours"; } diff --git a/src/main/java/net/citizensnpcs/trait/Gravity.java b/src/main/java/net/citizensnpcs/trait/Gravity.java index eb0ceb15a..dd905f876 100644 --- a/src/main/java/net/citizensnpcs/trait/Gravity.java +++ b/src/main/java/net/citizensnpcs/trait/Gravity.java @@ -9,7 +9,7 @@ public class Gravity extends Trait implements Toggleable { @Persist private boolean enabled; - public Gravity(String name) { + public Gravity() { super("gravity"); }