Ban NPCs from firing cuboid enter/exit events

DenizenScript · Mar 15, 2015 · c32fd74 · c32fd74
1 parent 7588e0b
commit c32fd74
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/events/core/CuboidEnterExitSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/CuboidEnterExitSmartEvent.java
@@ -112,13 +112,19 @@ public void breakDown() {
     // -->
     @EventHandler
     public void onPlayerTeleport(PlayerTeleportEvent event) {
+        if (dEntity.isNPC(event.getPlayer())) {
+            return;
+        }
         PlayerMoveEvent evt = new PlayerMoveEvent(event.getPlayer(), event.getFrom(), event.getTo());
         playerMoveEvent(evt);
         if (evt.isCancelled())
             event.setCancelled(true);
     }
 
     public void onWorldChange(PlayerChangedWorldEvent event) {
+        if (dEntity.isNPC(event.getPlayer())) {
+            return;
+        }
         Location to = event.getPlayer().getLocation().clone();
         Location from = event.getPlayer().getLocation().clone();
         from.setWorld(event.getFrom());
@@ -128,6 +134,9 @@ public void onWorldChange(PlayerChangedWorldEvent event) {
 
     @EventHandler
     public void playerMoveEvent(PlayerMoveEvent event) {
+        if (dEntity.isNPC(event.getPlayer())) {
+            return;
+        }
 
         if (event.getFrom().getBlock().equals(event.getTo().getBlock())) return;