From c0bced1fa180a7e70bc2020739aabc180dbb43b0 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Tue, 8 Aug 2023 17:48:55 +1000
Subject: [PATCH] Don't put entities removed during the portal exit event into
 an invalid state

---
 patches/server/Add-back-EntityPortalExitEvent.patch | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/patches/server/Add-back-EntityPortalExitEvent.patch b/patches/server/Add-back-EntityPortalExitEvent.patch
index c30f71f15..74271818d 100644
--- a/patches/server/Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/Add-back-EntityPortalExitEvent.patch
@@ -21,7 +21,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                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));
-+                if (event.callEvent() && event.getTo() != null && this.isAlive()) {
++                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();