Readd 0414 use distance map to optimise entity tracker (#9868)

1 files changed, 32 insertions, 0 deletions

diff --git a/patches/server/0834-Add-EntityPortalReadyEvent.patch b/patches/server/0834-Add-EntityPortalReadyEvent.patch
new file mode 100644
index 0000000000..b391863a8a
--- /dev/null
+++ b/patches/server/0834-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 ca0106627279c581550c5e86bfc9a1ee5a9d6173..a60bb065cedc9c70a4c9363d6994a9d00a5c15c9 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -3095,6 +3095,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) {
+@@ -3102,6 +3109,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+                     } else {
+                         this.changeDimension(worldserver1);
+                     }
++                    } // Paper
+                     // CraftBukkit end
+                     this.level().getProfiler().pop();
+                 }