1 files changed, 19 insertions, 0 deletions
diff --git a/patches/server/1058-Call-CraftPlayer-onEntityRemove-for-all-online-playe.patch b/patches/server/1058-Call-CraftPlayer-onEntityRemove-for-all-online-playe.patch
new file mode 100644
index 0000000000..a03d8a4094
--- /dev/null
+++ b/patches/server/1058-Call-CraftPlayer-onEntityRemove-for-all-online-playe.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Gero <[email protected]>
+Date: Sat, 9 Nov 2024 22:27:58 +0100
+Subject: [PATCH] Call CraftPlayer#onEntityRemove for all online players
+
+
+diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
+index 17ddec036cb6135c7489efbd76121304e76c32c0..7e8713373315eebf57541f8afe10902681449ad9 100644
+--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
++++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
+@@ -2800,7 +2800,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+             // CraftBukkit start
+             entity.valid = false;
+             if (!(entity instanceof ServerPlayer)) {
+-                for (ServerPlayer player : ServerLevel.this.players) {
++                for (ServerPlayer player : ServerLevel.this.server.getPlayerList().players) { // Paper - call onEntityRemove for all online players
+                     player.getBukkitEntity().onEntityRemove(entity);
+                 }
+             }