1 files changed, 27 insertions, 0 deletions
diff --git a/patches/server/0196-Add-EntityTeleportEndGatewayEvent.patch b/patches/server/0196-Add-EntityTeleportEndGatewayEvent.patch
new file mode 100644
index 0000000000..c43c6a3b23
--- /dev/null
+++ b/patches/server/0196-Add-EntityTeleportEndGatewayEvent.patch
@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shane Freeder <[email protected]>
+Date: Sat, 9 Jun 2018 14:08:39 +0200
+Subject: [PATCH] Add EntityTeleportEndGatewayEvent
+
+
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
+index 9690416c2ffa7d1b7607d21ae0a990dcbcbcddae..f8053b42fbf144d427cc4ed44b3b735358c58a20 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
+@@ -219,8 +219,14 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
+ 
+                 }
+ 
+-                org.bukkit.event.entity.EntityTeleportEvent teleEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTeleportEvent(entity1, blockposition1.getX() + 0.5, blockposition1.getY() + 0.5, blockposition1.getZ() + 0.5);
+-                if (teleEvent.isCancelled()) {
++                // Paper start - EntityTeleportEndGatewayEvent
++                org.bukkit.Location location = new org.bukkit.Location(world.getWorld(), blockposition1.getX() + 0.5D, blockposition1.getY(), blockposition1.getZ() + 0.5D);
++                location.setPitch(entity1.getXRot());
++                location.setYaw(entity1.getBukkitYaw());
++                org.bukkit.entity.Entity bukkitEntity = entity1.getBukkitEntity();
++                org.bukkit.event.entity.EntityTeleportEvent teleEvent = new com.destroystokyo.paper.event.entity.EntityTeleportEndGatewayEvent(bukkitEntity, bukkitEntity.getLocation(), location, new org.bukkit.craftbukkit.block.CraftEndGateway(world.getWorld(), blockEntity));
++                if (!teleEvent.callEvent() || teleEvent.getTo() == null) {
++                    // Paper end - EntityTeleportEndGatewayEvent
+                     return;
+                 }
+