2020-03-19 07:03:32 +01:00
|
|
|
From e7c4bd8bdfdae92f7a47353b1b3a1bd50721f93f Mon Sep 17 00:00:00 2001
|
2019-04-27 05:05:36 +02:00
|
|
|
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
|
2020-03-19 07:03:32 +01:00
|
|
|
index 9d0edf5382..fd42f34004 100644
|
2019-04-27 05:05:36 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
2020-03-19 07:03:32 +01:00
|
|
|
@@ -1148,7 +1148,7 @@ public class WorldServer extends World {
|
2019-10-19 10:14:26 +02:00
|
|
|
if (entity instanceof EntityInsentient) {
|
2019-12-11 03:43:21 +01:00
|
|
|
this.navigators.remove(((EntityInsentient) entity).getNavigation());
|
2019-10-19 10:14:26 +02:00
|
|
|
}
|
|
|
|
-
|
|
|
|
+ new com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
|
|
|
|
entity.valid = false; // CraftBukkit
|
|
|
|
}
|
|
|
|
|
2020-03-19 07:03:32 +01:00
|
|
|
@@ -1186,6 +1186,7 @@ public class WorldServer extends World {
|
2019-05-05 23:39:51 +02:00
|
|
|
entity.origin = entity.getBukkitEntity().getLocation();
|
2019-04-27 05:05:36 +02:00
|
|
|
}
|
2019-05-05 23:39:51 +02:00
|
|
|
// Paper end
|
2019-04-27 05:05:36 +02:00
|
|
|
+ new com.destroystokyo.paper.event.entity.EntityAddToWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
--
|
2020-03-19 07:03:32 +01:00
|
|
|
2.25.2
|
2019-04-27 05:05:36 +02:00
|
|
|
|