summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nms-patches/TileEntityEndGateway.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/nms-patches/TileEntityEndGateway.patch b/nms-patches/TileEntityEndGateway.patch
new file mode 100644
index 00000000..9dea5190
--- /dev/null
+++ b/nms-patches/TileEntityEndGateway.patch
@@ -0,0 +1,40 @@
+--- a/net/minecraft/server/TileEntityEndGateway.java
++++ b/net/minecraft/server/TileEntityEndGateway.java
+@@ -5,6 +5,10 @@
+ import java.util.Random;
+ import org.apache.logging.log4j.LogManager;
+ import org.apache.logging.log4j.Logger;
++import org.bukkit.Bukkit;
++import org.bukkit.Location;
++import org.bukkit.craftbukkit.entity.CraftPlayer;
++import org.bukkit.event.player.PlayerTeleportEvent;
+
+ public class TileEntityEndGateway extends TileEntity implements ITickable {
+
+@@ -103,6 +107,26 @@
+ if (this.h != null) {
+ BlockPosition blockposition = this.i ? this.h : this.j();
+
++ // CraftBukkit start - Fire PlayerTeleportEvent
++ if (entity instanceof EntityPlayer) {
++ org.bukkit.craftbukkit.entity.CraftPlayer player = (CraftPlayer) entity.getBukkitEntity();
++ org.bukkit.Location location = new Location(world.getWorld(), (double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D);
++ location.setPitch(player.getLocation().getPitch());
++ location.setYaw(player.getLocation().getYaw());
++
++ PlayerTeleportEvent teleEvent = new PlayerTeleportEvent(player, player.getLocation(), location, PlayerTeleportEvent.TeleportCause.END_GATEWAY);
++ Bukkit.getPluginManager().callEvent(teleEvent);
++ if (teleEvent.isCancelled()) {
++ return;
++ }
++
++ ((EntityPlayer) entity).playerConnection.teleport(teleEvent.getTo());
++ this.h();
++ return;
++
++ }
++ // CraftBukkit end
++
+ entity.enderTeleportTo((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D);
+ }
+