diff options
Diffstat (limited to 'patches/server/0922-Add-EntityPortalReadyEvent.patch')
| -rw-r--r-- | patches/server/0922-Add-EntityPortalReadyEvent.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/patches/server/0922-Add-EntityPortalReadyEvent.patch b/patches/server/0922-Add-EntityPortalReadyEvent.patch new file mode 100644 index 0000000000..9fdc15459a --- /dev/null +++ b/patches/server/0922-Add-EntityPortalReadyEvent.patch @@ -0,0 +1,32 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic <[email protected]> +Date: Wed, 12 May 2021 04:30:42 -0700 +Subject: [PATCH] Add EntityPortalReadyEvent + + +diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java +index 700e2299200b536255dd38c2f84e9ab13ab31811..f925a8d550ecbf2044a37bfe58b30d6578c5f6af 100644 +--- a/src/main/java/net/minecraft/world/entity/Entity.java ++++ b/src/main/java/net/minecraft/world/entity/Entity.java +@@ -2853,6 +2853,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { + if (true && !this.isPassenger() && this.portalTime++ >= i) { // CraftBukkit + this.level.getProfiler().push("portal"); + this.portalTime = i; ++ // Paper start ++ io.papermc.paper.event.entity.EntityPortalReadyEvent event = new io.papermc.paper.event.entity.EntityPortalReadyEvent(this.getBukkitEntity(), worldserver1 == null ? null : worldserver1.getWorld(), org.bukkit.PortalType.NETHER); ++ if (!event.callEvent()) { ++ this.portalTime = 0; ++ } else { ++ worldserver1 = event.getTargetWorld() == null ? null : ((CraftWorld) event.getTargetWorld()).getHandle(); ++ // Paper end + this.setPortalCooldown(); + // CraftBukkit start + if (this instanceof ServerPlayer) { +@@ -2860,6 +2867,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { + } else { + this.changeDimension(worldserver1); + } ++ } // Paper + // CraftBukkit end + this.level.getProfiler().pop(); + } |