mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 15:08:27 +02:00
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: e970fd72 Remove incorrect javadoc from TargetReason 84df6df1 SPIGOT-5282: Improve bucket event API CraftBukkit Changes:b2bcde89
SPIGOT-5258: TNT Not Moving Players in Creative Mode44d675ad
SPIGOT-5263: Chests stay open after InventoryOpenEvent cancelled.2439178e
SPIGOT-5278: EntityDrowned memory leak7055c931
SPIGOT-5264: Call event for experience orbs losing their target49141172
SPIGOT-5282: Improve bucket event API6bbb3b04
SPIGOT-5281: Clearer error messages for ChunkSnapshot misuse
30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
From 28da537c21333472d003bba3210cdb2362f7a75b 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 362cb6bf8..2817b20b2 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
@@ -1127,6 +1127,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
|
|
}
|
|
|
|
}
|
|
@@ -1135,6 +1136,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
|
|
|