1 files changed, 27 insertions, 0 deletions
diff --git a/Spigot-Server-Patches-Unmapped/0073-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches-Unmapped/0073-Entity-AddTo-RemoveFrom-World-Events.patch
new file mode 100644
index 0000000000..e910aa110a
--- /dev/null
+++ b/Spigot-Server-Patches-Unmapped/0073-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+Date: Mon, 28 Mar 2016 20:32:58 -0400
+Subject: [PATCH] Entity AddTo/RemoveFrom World Events
+
+
+diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
+index c5baf9c448761f24c4fd49d7c4bade7dee43edf4..b40089319329a0843c4d74ebd6189fc4089e319a 100644
+--- a/src/main/java/net/minecraft/server/level/WorldServer.java
++++ b/src/main/java/net/minecraft/server/level/WorldServer.java
+@@ -1214,7 +1214,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+         if (entity instanceof EntityInsentient) {
+             this.navigators.remove(((EntityInsentient) entity).getNavigation());
+         }
+-
++        new com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
+         entity.valid = false; // CraftBukkit
+     }
+ 
+@@ -1252,6 +1252,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+                 entity.origin = entity.getBukkitEntity().getLocation();
+             }
+             // Paper end
++            new com.destroystokyo.paper.event.entity.EntityAddToWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
+         }
+ 
+     }