diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityTeleportScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityTeleportScriptEvent.java index 1ab3ad9567..477aaac242 100644 --- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityTeleportScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityTeleportScriptEvent.java @@ -137,9 +137,8 @@ else if (name.equals("cause")) { return super.getContext(name); } - @EventHandler(ignoreCancelled = true) + @EventHandler public void onEntityTeleports(EntityTeleportEvent event) { - // TODO: cuboids? to = new dLocation(event.getTo()); from = new dLocation(event.getFrom()); entity = new dEntity(event.getEntity()); @@ -153,13 +152,11 @@ public void onEntityTeleports(EntityTeleportEvent event) { event.setTo(to); } - @EventHandler(ignoreCancelled = true) + @EventHandler public void onPlayerTeleports(PlayerTeleportEvent event) { - if (dEntity.isNPC(event.getPlayer())) { return; } - from = new dLocation(event.getFrom()); to = new dLocation(event.getTo()); entity = new dEntity(event.getPlayer());