From 62acf6880a8c11c7f5e3e5cd49b7e1d2c366ed6b Mon Sep 17 00:00:00 2001
From: mcmonkey4eva <mcmonkey4eva@hotmail.com>
Date: Sun, 17 Jan 2016 03:44:46 -0800
Subject: [PATCH] clean teleports event a little

---
 .../denizen/events/entity/EntityTeleportScriptEvent.java   | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

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());