aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0739-Add-EntityPortalReadyEvent.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0739-Add-EntityPortalReadyEvent.patch')
-rw-r--r--patches/server/0739-Add-EntityPortalReadyEvent.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/patches/server/0739-Add-EntityPortalReadyEvent.patch b/patches/server/0739-Add-EntityPortalReadyEvent.patch
new file mode 100644
index 0000000000..11414b6d48
--- /dev/null
+++ b/patches/server/0739-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 ba6f680e9a851376960c6a3e29db5d6ca46c7e85..d6559c4dd5b6499903f8e5777710d48523104fa7 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -2867,6 +2867,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+ if (true && !this.isPassenger() && this.portalTime++ >= i) { // CraftBukkit
+ this.level().getProfiler().push("portal");
+ this.portalTime = i;
++ // Paper start - Add EntityPortalReadyEvent
++ 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 - Add EntityPortalReadyEvent
+ this.setPortalCooldown();
+ // CraftBukkit start
+ if (this instanceof ServerPlayer) {
+@@ -2874,6 +2881,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+ } else {
+ this.changeDimension(worldserver1);
+ }
++ } // Paper - Add EntityPortalReadyEvent
+ // CraftBukkit end
+ this.level().getProfiler().pop();
+ }