304244232f
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: aba2aaaf Correct pom.xml version CraftBukkit Changes: e8b39d43 SPIGOT-5103: World.save does not save gamerules 3164e531 Correct pom.xml version Spigot Changes: 595711b0 Correct pom.xml version
30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
From 6d05403d0e84f2b76bc5a0824f0a7c05890d08be Mon Sep 17 00:00:00 2001
|
|
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
|
|
--- 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 {
|
|
entity.origin = entity.getBukkitEntity().getLocation();
|
|
}
|
|
// Paper end
|
|
+ new com.destroystokyo.paper.event.entity.EntityAddToWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
|
|
}
|
|
|
|
}
|
|
@@ -1118,6 +1119,7 @@ public class WorldServer extends World {
|
|
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
|
|
|