From bd7c76a1cf2a5a969981dfdbf272c59c45bb98f4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 2 Jan 2017 11:49:36 -0500 Subject: [PATCH] Use alternate constructor for EndGateway - Fixes #563 --- .../0198-PlayerTeleportEndGatewayEvent.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Spigot-Server-Patches/0198-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0198-PlayerTeleportEndGatewayEvent.patch index 5439a0e9e2..0d6228bb3b 100644 --- a/Spigot-Server-Patches/0198-PlayerTeleportEndGatewayEvent.patch +++ b/Spigot-Server-Patches/0198-PlayerTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From f0cd98d910ddefaf78ab4dcb659a7319cda9e995 Mon Sep 17 00:00:00 2001 +From 0150fcf323ed48b95594a792965d7c161780f04e Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 31 Dec 2016 21:44:50 -0500 Subject: [PATCH] PlayerTeleportEndGatewayEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerTeleportEndGatewayEvent Allows you to access the Gateway being used in a teleport event diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java -index 065d0bbfc..678d4dedb 100644 +index 065d0bbfc..ea8992d72 100644 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java @@ -124,7 +124,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick @@ -14,7 +14,7 @@ index 065d0bbfc..678d4dedb 100644 location.setYaw(player.getLocation().getYaw()); - PlayerTeleportEvent teleEvent = new PlayerTeleportEvent(player, player.getLocation(), location, PlayerTeleportEvent.TeleportCause.END_GATEWAY); -+ PlayerTeleportEvent teleEvent = new com.destroystokyo.paper.event.player.PlayerTeleportEndGatewayEvent(player, player.getLocation(), location, new org.bukkit.craftbukkit.block.CraftEndGateway(org.bukkit.Material.END_GATEWAY, this)); // Paper ++ PlayerTeleportEvent teleEvent = new com.destroystokyo.paper.event.player.PlayerTeleportEndGatewayEvent(player, player.getLocation(), location, new org.bukkit.craftbukkit.block.CraftEndGateway(MCUtil.toLocation(world, this.getPosition()).getBlock())); // Paper Bukkit.getPluginManager().callEvent(teleEvent); if (teleEvent.isCancelled()) { return;