From d6e698d6190c300bef48197ee78e5aab6b67b600 Mon Sep 17 00:00:00 2001 From: Jeremy Schroeder Date: Wed, 7 Nov 2012 22:23:02 -0500 Subject: [PATCH] Add a few methods for setting lookclose/gravity directly. --- src/main/java/net/citizensnpcs/trait/Gravity.java | 4 ++++ src/main/java/net/citizensnpcs/trait/LookClose.java | 8 ++++++-- .../trait/waypoint/triggers/WaypointTriggerRegistry.java | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/citizensnpcs/trait/Gravity.java b/src/main/java/net/citizensnpcs/trait/Gravity.java index dd905f876..cd8f7a7a2 100644 --- a/src/main/java/net/citizensnpcs/trait/Gravity.java +++ b/src/main/java/net/citizensnpcs/trait/Gravity.java @@ -21,6 +21,10 @@ public class Gravity extends Trait implements Toggleable { velocity.setY(Math.max(velocity.getY(), 0)); npc.getBukkitEntity().setVelocity(velocity); } + + public void gravitate(boolean gravitate) { + enabled = gravitate; + } @Override public boolean toggle() { diff --git a/src/main/java/net/citizensnpcs/trait/LookClose.java b/src/main/java/net/citizensnpcs/trait/LookClose.java index 90c91fd37..f95aa185e 100644 --- a/src/main/java/net/citizensnpcs/trait/LookClose.java +++ b/src/main/java/net/citizensnpcs/trait/LookClose.java @@ -39,7 +39,11 @@ public class LookClose extends Trait implements Toggleable, CommandConfigurable realisticLooking = args.hasFlag('r'); } - private void findNewTarget() { + public void lookClose(boolean lookClose) { + enabled = lookClose; + } + + private void findNewTarget() { List nearby = npc.getBukkitEntity().getNearbyEntities(range, range, range); final Location npcLocation = npc.getBukkitEntity().getLocation(); Collections.sort(nearby, new Comparator() { @@ -114,7 +118,7 @@ public class LookClose extends Trait implements Toggleable, CommandConfigurable enabled = !enabled; return enabled; } - + @Override public String toString() { return "LookClose{" + enabled + "}"; diff --git a/src/main/java/net/citizensnpcs/trait/waypoint/triggers/WaypointTriggerRegistry.java b/src/main/java/net/citizensnpcs/trait/waypoint/triggers/WaypointTriggerRegistry.java index 2d28b834a..55aa41727 100644 --- a/src/main/java/net/citizensnpcs/trait/waypoint/triggers/WaypointTriggerRegistry.java +++ b/src/main/java/net/citizensnpcs/trait/waypoint/triggers/WaypointTriggerRegistry.java @@ -53,5 +53,6 @@ public class WaypointTriggerRegistry implements Persister { addTrigger("chat", ChatTrigger.class, ChatTriggerPrompt.class); addTrigger("delay", DelayTrigger.class, DelayTriggerPrompt.class); addTrigger("teleport", TeleportTrigger.class, TeleportTriggerPrompt.class); + addTrigger("pose", PoseTrigger.class, PoseTriggerPrompt.class); } }