Updated Upstream ()

Upstream has released updates that appear to apply and compile correctly
This commit is contained in:
BillyGalbreath
2022-11-13 04:52:10 -06:00
parent f72fd9b28b
commit 85bc4a4a83
18 changed files with 52 additions and 52 deletions

View File

@@ -18,7 +18,7 @@ index eb4dac2239592d680ef31edf47f1ab660299762d..1b956c3f50750a00eaf7851112004115
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 f3ea3860bda768a8bed4175fd993b708f3ab5de4..467f60dcbed645d773e7e3e042d2bbbd8f5bb589 100644
index 7917c6d10136cc16f95821a6e2f508f3f3c79ad2..14b2c36049c91a8abfc545e2fb5e3d6f908370e8 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -263,6 +263,7 @@ public class ServerPlayer extends Player {
@@ -45,7 +45,7 @@ index f3ea3860bda768a8bed4175fd993b708f3ab5de4..467f60dcbed645d773e7e3e042d2bbbd
nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur
}
@@ -2640,6 +2643,14 @@ public class ServerPlayer extends Player {
@@ -2642,6 +2645,14 @@ public class ServerPlayer extends Player {
}
}