35 lines
2.0 KiB
Diff
35 lines
2.0 KiB
Diff
|
From de0b586bc05412392f63b9bb4b6f2ce7f3e77c97 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
||
|
|
Date: Sat, 9 Jun 2018 13:08:39 +0100
|
||
|
|
Subject: [PATCH] Implement EntityTeleportEndGatewayEvent
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
|
||
|
|
index ecbc48b0c..c84569612 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
|
||
|
|
@@ -136,8 +136,19 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
|
||
|
|
|
||
|
|
}
|
||
|
|
// CraftBukkit end
|
||
|
|
+ // Paper start - EntityTeleportEndGatewayEvent - replicated from above
|
||
|
|
+ org.bukkit.craftbukkit.entity.CraftEntity bukkitEntity = 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(bukkitEntity.getLocation().getPitch());
|
||
|
|
+ location.setYaw(bukkitEntity.getLocation().getYaw());
|
||
|
|
+
|
||
|
|
+ com.destroystokyo.paper.event.entity.EntityTeleportEndGatewayEvent event = new com.destroystokyo.paper.event.entity.EntityTeleportEndGatewayEvent(bukkitEntity, bukkitEntity.getLocation(), location, new org.bukkit.craftbukkit.block.CraftEndGateway(MCUtil.toLocation(world, this.getPosition()).getBlock()));
|
||
|
|
+ if (event.isCancelled()) {
|
||
|
|
+ return;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
- entity.enderTeleportTo((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D);
|
||
|
|
+ entity.enderTeleportTo(event.getTo().getX(), event.getTo().getY(), event.getTo().getZ());
|
||
|
|
+ // Paper end - EntityTeleportEndGatewayEvent
|
||
|
|
}
|
||
|
|
|
||
|
|
this.h();
|
||
|
|
--
|
||
|
|
2.17.1
|
||
|
|
|