Set event priorty to MONITOR for right click entity events

CitizensDev · Nov 5, 2013 · f3c6cdc · f3c6cdc
1 parent 923d078
commit f3c6cdc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/net/citizensnpcs/EventListen.java b/src/main/java/net/citizensnpcs/EventListen.java
@@ -242,7 +242,7 @@ public void onPlayerCreateNPC(PlayerCreateNPCEvent event) {
         checkCreationEvent(event);
     }
 
-    @EventHandler(ignoreCancelled = true)
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
     public void onPlayerInteractEntity(PlayerInteractEntityEvent event) {
         NPC npc = npcRegistry.getNPC(event.getRightClicked());
         if (npc == null) {

diff --git a/src/main/java/net/citizensnpcs/trait/Controllable.java b/src/main/java/net/citizensnpcs/trait/Controllable.java
@@ -203,7 +203,7 @@ public boolean toggle() {
         return enabled;
     }
 
-    private double updateHorizontralSpeed(EntityLiving handle, double speed, float speedMod) {
+    private double updateHorizontalSpeed(EntityLiving handle, double speed, float speedMod) {
         double oldSpeed = Math.sqrt(handle.motX * handle.motX + handle.motZ * handle.motZ);
         double horizontal = ((EntityLiving) handle.passenger).bf;
         if (horizontal > 0.0D) {
@@ -253,7 +253,7 @@ public void run(Player rider) {
             boolean onGround = handle.onGround;
             float speedMod = npc.getNavigator().getDefaultParameters()
                     .modifiedSpeed((onGround ? GROUND_SPEED : AIR_SPEED));
-            this.speed = updateHorizontralSpeed(handle, speed, speedMod);
+            this.speed = updateHorizontalSpeed(handle, speed, speedMod);
 
             boolean shouldJump = NMS.shouldJump(handle.passenger);
             if (shouldJump) {
@@ -275,7 +275,7 @@ public void run(Player rider) {
     }
 
     public class LookAirController implements MovementController {
-        boolean paused = false;
+        private boolean paused = false;
 
         @Override
         public void leftClick(PlayerInteractEvent event) {
@@ -319,7 +319,7 @@ public static interface MovementController {
     }
 
     public class PlayerInputAirController implements MovementController {
-        boolean paused = false;
+        private boolean paused = false;
         private double speed;
 
         @Override
@@ -344,7 +344,7 @@ public void run(Player rider) {
                 return;
             }
             EntityLiving handle = getHandle();
-            this.speed = updateHorizontralSpeed(handle, this.speed, 1F);
+            this.speed = updateHorizontalSpeed(handle, this.speed, 1F);
             boolean shouldJump = NMS.shouldJump(handle.passenger);
             if (shouldJump) {
                 handle.motY = 0.3F;