2019-07-08 15:29:22 +02:00
|
|
|
From 41fc6241ac74a486d2515d43f542b4d0c04c192d 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
|
2019-07-08 15:29:22 +02:00
|
|
|
index 443986ef3a..28a6a62dfc 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
|
2019-07-08 15:29:22 +02:00
|
|
|
@@ -1110,6 +1110,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
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
2019-07-08 15:29:22 +02:00
|
|
|
@@ -1119,6 +1120,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);
|
|
|
|
--
|
2019-06-25 03:47:58 +02:00
|
|
|
2.22.0
|
2019-04-27 05:05:36 +02:00
|
|
|
|