Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@e56e53f Fix some component bugs in login disconnect packet (#10090)
PaperMC/Paper@3484ae9 Call entity_die game event after event cancel check (#10096)
PaperMC/Paper@0ae58c0 cleanup player death event adventure logic (#10095)
This commit is contained in:
granny
2023-12-29 23:36:48 -08:00
parent 04ee5e7c28
commit c049bfbd53
16 changed files with 40 additions and 40 deletions

View File

@@ -17,7 +17,7 @@ index bf51f5e414ab45e33efa4057ab251120290b43e1..428dd75450bdd5daf902a1fbaca7031a
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 852d773149782f052da7e1937d955ba1d19c7f20..fd44606db9581ec93487c51a955b58cb7f3066da 100644
index 71dc8baa9eb93728c982139dde16f1c4567d1925..cd449e35bbc689ce6d2595693a4fbe1f226998c8 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -283,6 +283,7 @@ public class ServerPlayer extends Player {
@@ -44,7 +44,7 @@ index 852d773149782f052da7e1937d955ba1d19c7f20..fd44606db9581ec93487c51a955b58cb
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2902,5 +2905,13 @@ public class ServerPlayer extends Player {
@@ -2903,5 +2906,13 @@ public class ServerPlayer extends Player {
public void tpsBar(boolean tpsBar) {
this.tpsBar = tpsBar;
}