testserver/Spigot-Server-Patches/0074-Entity-AddTo-RemoveFro...

28 lines
1.3 KiB
Diff
Raw Normal View History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2019-04-27 03:05:36 +00:00
From: Aikar <aikar@aikar.co>
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/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
2020-06-25 11:00:35 +00:00
index cc96ce0cb2e75dd86b413da76e878d511cd4e039..f6940921dec04eedc393578ec9827e6f8516611c 100644
2019-04-27 03:05:36 +00:00
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
2020-06-25 11:00:35 +00:00
@@ -1057,7 +1057,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
if (entity instanceof EntityInsentient) {
2019-12-11 02:43:21 +00:00
this.navigators.remove(((EntityInsentient) entity).getNavigation());
}
-
+ new com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
entity.valid = false; // CraftBukkit
}
2020-06-25 11:00:35 +00:00
@@ -1095,6 +1095,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
2019-05-05 21:39:51 +00:00
entity.origin = entity.getBukkitEntity().getLocation();
2019-04-27 03:05:36 +00:00
}
2019-05-05 21:39:51 +00:00
// Paper end
2019-04-27 03:05:36 +00:00
+ new com.destroystokyo.paper.event.entity.EntityAddToWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
}
}