From 53309e9172145cd963b66b813ae427156083b4b2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:57:15 -0400 Subject: [PATCH] Actually fire those events --- .../0115-Entity-AddTo-RemoveFrom-World-Events.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Spigot-Server-Patches/0115-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0115-Entity-AddTo-RemoveFrom-World-Events.patch index 31fc41576a..092967e32e 100644 --- a/Spigot-Server-Patches/0115-Entity-AddTo-RemoveFrom-World-Events.patch +++ b/Spigot-Server-Patches/0115-Entity-AddTo-RemoveFrom-World-Events.patch @@ -1,18 +1,18 @@ -From ba08cdb1b65264542221e56bf8178ec42ca2aeae Mon Sep 17 00:00:00 2001 +From d57d1c515d1fbe5155a0a161481a6055822d5222 Mon Sep 17 00:00:00 2001 From: Aikar 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/World.java b/src/main/java/net/minecraft/server/World.java -index fcd7cd6..b1c78b5 100644 +index fcd7cd6..9d4a92f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1119,6 +1119,7 @@ public abstract class World implements IBlockAccess { } entity.valid = true; // CraftBukkit -+ new com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent(entity.getBukkitEntity()); // Paper - fire while valid ++ new com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid } protected void c(Entity entity) { @@ -20,7 +20,7 @@ index fcd7cd6..b1c78b5 100644 ((IWorldAccess) this.u.get(i)).b(entity); } -+ new com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent(entity.getBukkitEntity()); // Paper - fire while valid ++ new com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid entity.valid = false; // CraftBukkit }