mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit) (#7009)

Browse source
This commit is contained in:
Jake Potrebic 2021-12-03 17:33:56 -08:00 • committed by GitHub
parent a41444735a
commit b653ee1a91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
patches/server/0074-Entity-AddTo-RemoveFrom-World-Events.patch
View file

@ -5,7 +5,7 @@ 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 afaaff4f49f083c1071d082856181e3d815ea227..8c5133defa9d3166cf987a6f1d02f02f0515746d 100644
index 4611c44a460f87df864dd88f9ae961f9c0bc0d29..6869a07e4a3cfc19b5e814c7e3162d5315ec8908 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1993,6 +1993,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@ -16,10 +16,10 @@ index afaaff4f49f083c1071d082856181e3d815ea227..8c5133defa9d3166cf987a6f1d02f02f
}
public void onTrackingEnd(Entity entity) {
@@ -2057,6 +2058,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2064,6 +2065,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
}
entity.valid = false; // CraftBukkit
// CraftBukkit end
+ new com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
}
}