Updated Upstream (Bukkit/CraftBukkit) (#7009)

This commit is contained in:
Jake Potrebic 2021-12-03 17:33:56 -08:00
parent f25255a7b8
commit 6682552eb2
4 changed files with 6 additions and 6 deletions

View file

@ -17,9 +17,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
public void onTrackingEnd(Entity entity) {
@@ -0,0 +0,0 @@ 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
}
}

View file

@ -116,5 +116,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ }
+ // Paper end
public void removeDisconnectingPlayer(Player player) {
this.hiddenEntities.remove(player.getUniqueId());
public void onEntityRemove(Entity entity) {
this.hiddenEntities.remove(entity.getUUID());

@ -1 +1 @@
Subproject commit 9115281ff1762658109d43c1bd4fca8b7814d7f2
Subproject commit 1c9ca4054853af6e4210a63cb71fc537d4d4af95

@ -1 +1 @@
Subproject commit fd3478bc77e3b1280e1e02dba6822490a51f011d
Subproject commit 1825cc0b04ff9e14df7a511aec855ad80a896d19