28 lines
1.3 KiB
Diff
28 lines
1.3 KiB
Diff
|
From 0000000000000000000000000000000000000000 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/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||
|
|
index 8b0a384caa09848d61b3a6259dd56590cd52d0a0..f7eddb39985072afeb79ec0cbfc084d7e84638e6 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||
|
|
@@ -1208,7 +1208,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
|
||
|
|
if (entity instanceof Mob) {
|
||
|
|
this.navigations.remove(((Mob) entity).getNavigation());
|
||
|
|
}
|
||
|
|
-
|
||
|
|
+ new com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
|
||
|
|
entity.valid = false; // CraftBukkit
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -1246,6 +1246,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
|
||
|
|
entity.origin = entity.getBukkitEntity().getLocation();
|
||
|
|
}
|
||
|
|
// Paper end
|
||
|
|
+ new com.destroystokyo.paper.event.entity.EntityAddToWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
|
||
|
|
}
|
||
|
|
|
||
|
|
}
|