3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-20 21:40:06 +01:00
Paper/nms-patches/TileEntityEndGateway.patch

49 Zeilen
2.2 KiB
Diff

--- a/net/minecraft/server/TileEntityEndGateway.java
+++ b/net/minecraft/server/TileEntityEndGateway.java
2018-11-06 08:12:31 +01:00
@@ -6,11 +6,17 @@
2016-05-10 13:47:39 +02:00
import javax.annotation.Nullable;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
2016-05-10 13:47:39 +02:00
+// CraftBukkit start
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.bukkit.event.player.PlayerTeleportEvent;
2016-05-10 13:47:39 +02:00
+// CraftBukkit end
2016-11-17 02:41:03 +01:00
public class TileEntityEndGateway extends TileEntityEnderPortal implements ITickable {
2018-11-06 08:12:31 +01:00
private static final Logger a = LogManager.getLogger();
- private long e;
+ public long e; // PAIL
private int f;
public BlockPosition exitPortal;
public boolean exactTeleport;
2018-07-15 02:00:00 +02:00
@@ -113,6 +119,26 @@
2016-05-10 13:47:39 +02:00
if (this.exitPortal != null) {
2018-07-15 02:00:00 +02:00
BlockPosition blockposition = this.exactTeleport ? this.exitPortal : this.i();
+ // 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());
2018-07-15 02:00:00 +02:00
+ this.f(); // CraftBukkit - call at end of method
+ return;
+
+ }
+ // CraftBukkit end
+
entity.enderTeleportTo((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D);
}