PaperMC/Spigot-Server-Patches/0075-Entity-AddTo-RemoveFrom-World-Events.patch

30 lines
1.3 KiB
Diff
Raw Normal View History

From 0a45d9187c646b7b0fa332fcd3e9385cfe607950 Mon Sep 17 00:00:00 2001
2019-04-27 05:05:36 +02: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
index b7e98bc269..edcb99be2c 100644
2019-04-27 05:05:36 +02:00
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1109,6 +1109,7 @@ public class WorldServer extends World {
2019-05-05 23:39:51 +02:00
entity.origin = entity.getBukkitEntity().getLocation();
2019-04-27 05:05:36 +02:00
}
2019-05-05 23:39:51 +02:00
// Paper end
2019-04-27 05:05:36 +02:00
+ new com.destroystokyo.paper.event.entity.EntityAddToWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
}
}
@@ -1118,6 +1119,7 @@ public class WorldServer extends World {
2019-04-27 05:05:36 +02: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.22.0
2019-04-27 05:05:36 +02:00