2020-05-06 09:48:49 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2019-04-27 03:05:36 +00:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Mon, 28 Mar 2016 20:32:58 -0400
|
|
|
|
Subject: [PATCH] Entity AddTo/RemoveFrom World Events
|
|
|
|
|
|
|
|
|
2021-03-16 07:19:45 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
|
2021-04-07 05:17:32 +00:00
|
|
|
index c5baf9c448761f24c4fd49d7c4bade7dee43edf4..b40089319329a0843c4d74ebd6189fc4089e319a 100644
|
2021-03-16 07:19:45 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
|
2021-04-07 05:17:32 +00:00
|
|
|
@@ -1214,7 +1214,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
2019-10-19 08:14:26 +00:00
|
|
|
if (entity instanceof EntityInsentient) {
|
2019-12-11 02:43:21 +00:00
|
|
|
this.navigators.remove(((EntityInsentient) entity).getNavigation());
|
2019-10-19 08:14:26 +00:00
|
|
|
}
|
|
|
|
-
|
|
|
|
+ new com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
|
|
|
|
entity.valid = false; // CraftBukkit
|
|
|
|
}
|
|
|
|
|
2021-04-07 05:17:32 +00:00
|
|
|
@@ -1252,6 +1252,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
2019-05-05 21:39:51 +00:00
|
|
|
entity.origin = entity.getBukkitEntity().getLocation();
|
2019-04-27 03:05:36 +00:00
|
|
|
}
|
2019-05-05 21:39:51 +00:00
|
|
|
// Paper end
|
2019-04-27 03:05:36 +00:00
|
|
|
+ new com.destroystokyo.paper.event.entity.EntityAddToWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|