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

@@ -18,7 +18,7 @@ index c1202a56b560269e132eafd8bb12383473d4d33e..815af29d1aae935264a400bdb9c3d676
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 b44dbc0b989658c82aa68e83b094e295dc4e5fe5..8e36b261a4f8ea82bab778d3abd3326aa347d19a 100644
index f152066b6b19b6c5d7f4f7c4eb66ed0b440342c5..37a3ce5da2cb89675e0180c4ed937e5851cd002b 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -284,6 +284,7 @@ public class ServerPlayer extends Player {
@@ -45,7 +45,7 @@ index b44dbc0b989658c82aa68e83b094e295dc4e5fe5..8e36b261a4f8ea82bab778d3abd3326a
nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur
}
@@ -2914,5 +2917,13 @@ public class ServerPlayer extends Player {
@@ -2915,5 +2918,13 @@ public class ServerPlayer extends Player {
public void compassBar(boolean compassBar) {
this.compassBar = compassBar;
}