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

30 lines
1.3 KiB
Diff
Raw Normal View History

2019-05-06 02:58:04 +00:00
From c5bd4c046c5623d852b9dc727a4b8f0cba872b3f 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
2019-05-06 02:58:04 +00:00
index 5fe2041b9d..269f793926 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
2019-05-06 02:58:04 +00:00
@@ -1108,6 +1108,7 @@ public class WorldServer extends World {
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
}
}
2019-05-06 02:58:04 +00:00
@@ -1117,6 +1118,7 @@ public class WorldServer extends World {
2019-04-27 03:05:36 +00:00
if (this.tickingEntities) {
throw new IllegalStateException("Removing entity while ticking!");
} else {
+ new com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
this.removeEntityFromChunk(entity);
this.entitiesById.remove(entity.getId());
this.unregisterEntity(entity);
--
2.21.0