mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-30 15:37:40 +02:00
0f2ea04c1c
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: af58d316 Fix javadoc warning in Firework.setShotAtAngle CraftBukkit Changes:e2dd6555SPIGOT-5372: Re-add tile entity fixer due to MC-1639451e7a197fFix incorrect inequality in683bae0670db98d54dSPIGOT-5362: Suspicious stews fail isSimilar check Spigot Changes: 56f84710 Rebuild patches
30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
From b0480963f5822a8ad1c6d4a849c1d276b47188f9 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 559dee777..bd5b16299 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
@@ -1159,6 +1159,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
|
|
}
|
|
|
|
}
|
|
@@ -1167,6 +1168,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.23.0
|
|
|