1 files changed, 50 insertions, 0 deletions
diff --git a/patches/server/0658-Add-back-EntityPortalExitEvent.patch b/patches/server/0658-Add-back-EntityPortalExitEvent.patch
new file mode 100644
index 0000000000..fa64daa44d
--- /dev/null
+++ b/patches/server/0658-Add-back-EntityPortalExitEvent.patch
@@ -0,0 +1,50 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Sun, 16 May 2021 09:39:46 -0700
+Subject: [PATCH] Add back EntityPortalExitEvent
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+index cfc9732378772084cd0badabaccd3de934b39596..0dcc94b713593a298f09d489780f38298d5f4cc5 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -3365,6 +3365,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+             } else {
+                 // CraftBukkit start
+                 worldserver = shapedetectorshape.world;
++                // Paper start - Call EntityPortalExitEvent
++                CraftEntity bukkitEntity = this.getBukkitEntity();
++                Vec3 position = shapedetectorshape.pos;
++                float yaw = shapedetectorshape.yRot;
++                float pitch = bukkitEntity.getLocation().getPitch(); // Keep entity pitch as per moveTo line below
++                Vec3 velocity = shapedetectorshape.speed;
++                org.bukkit.event.entity.EntityPortalExitEvent event = new org.bukkit.event.entity.EntityPortalExitEvent(bukkitEntity,
++                    bukkitEntity.getLocation(), new Location(worldserver.getWorld(), position.x, position.y, position.z, yaw, pitch),
++                    bukkitEntity.getVelocity(), org.bukkit.craftbukkit.util.CraftVector.toBukkit(shapedetectorshape.speed));
++                event.callEvent();
++                if (this.isRemoved()) {
++                    return null;
++                }
++
++                if (!event.isCancelled() && event.getTo() != null) {
++                    worldserver = ((CraftWorld) event.getTo().getWorld()).getHandle();
++                    position = new Vec3(event.getTo().getX(), event.getTo().getY(), event.getTo().getZ());
++                    yaw = event.getTo().getYaw();
++                    pitch = event.getTo().getPitch();
++                    velocity = org.bukkit.craftbukkit.util.CraftVector.toNMS(event.getAfter());
++                }
++                // Paper end
+                 if (worldserver == this.level) {
+                     // SPIGOT-6782: Just move the entity if a plugin changed the world to the one the entity is already in
+                     this.moveTo(shapedetectorshape.pos.x, shapedetectorshape.pos.y, shapedetectorshape.pos.z, shapedetectorshape.yRot, shapedetectorshape.xRot);
+@@ -3384,8 +3406,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+ 
+                 if (entity != null) {
+                     entity.restoreFrom(this);
+-                    entity.moveTo(shapedetectorshape.pos.x, shapedetectorshape.pos.y, shapedetectorshape.pos.z, shapedetectorshape.yRot, entity.getXRot());
+-                    entity.setDeltaMovement(shapedetectorshape.speed);
++                    entity.moveTo(position.x, position.y, position.z, yaw, pitch); // Paper - use EntityPortalExitEvent values
++                    entity.setDeltaMovement(velocity); // Paper - use EntityPortalExitEvent values
+                     worldserver.addDuringTeleport(entity);
+                     if (worldserver.getTypeKey() == LevelStem.END) { // CraftBukkit
+                         ServerLevel.makeObsidianPlatform(worldserver, this); // CraftBukkit