diff --git a/nms-patches/EntityLiving.patch b/nms-patches/EntityLiving.patch
index e98c137c56..be5dbc2ed6 100644
--- a/nms-patches/EntityLiving.patch
+++ b/nms-patches/EntityLiving.patch
@@ -580,22 +580,25 @@
  
              if (itemstack != null && itemstack.count == 0) {
                  itemstack = null;
-@@ -2051,7 +2332,17 @@
+@@ -2051,10 +2332,18 @@
              }
  
              if (flag1) {
 -                this.enderTeleportTo(this.locX, this.locY, this.locZ);
+-                if (world.getCubes(this, this.getBoundingBox()).isEmpty() && !world.containsLiquid(this.getBoundingBox())) {
+-                    flag = true;
 +                // CraftBukkit start - Teleport event
 +                // this.enderTeleportTo(this.locX, this.locY, this.locZ);
 +                EntityTeleportEvent teleport = new EntityTeleportEvent(this.getBukkitEntity(), new Location(this.world.getWorld(), d3, d4, d5), new Location(this.world.getWorld(), this.locX, this.locY, this.locZ));
 +                this.world.getServer().getPluginManager().callEvent(teleport);
-+                if (teleport.isCancelled()) {
-+                    return false;
-+                }
-+
-+                Location to = teleport.getTo();
-+                this.enderTeleportTo(to.getX(), to.getY(), to.getZ());
-+                // CraftBukkit end
-                 if (world.getCubes(this, this.getBoundingBox()).isEmpty() && !world.containsLiquid(this.getBoundingBox())) {
-                     flag = true;
++                if (!teleport.isCancelled()) {
++                    Location to = teleport.getTo();
++                    this.enderTeleportTo(to.getX(), to.getY(), to.getZ());
++                    if (world.getCubes(this, this.getBoundingBox()).isEmpty() && !world.containsLiquid(this.getBoundingBox())) {
++                        flag = true;
++                    }
                  }
++                // CraftBukkit end
+             }
+         }
+