twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 20:52:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Bukkit/CraftBukkit) (#7009)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/Entity-AddTo-RemoveFrom-World-Events.patch
View File

@@ -17,9 +17,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
public void onTrackingEnd(Entity entity) { public void onTrackingEnd(Entity entity) {
@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
} }
// CraftBukkit end
entity.valid = false; // CraftBukkit
+ new com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid + new com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
} }
} }

4
patches/server/Player.setPlayerProfile-API.patch
View File

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

2
work/Bukkit

Submodule work/Bukkit updated: 9115281ff1...1c9ca40548

2
work/CraftBukkit

Submodule work/CraftBukkit updated: fd3478bc77...1825cc0b04