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

@@ -17,7 +17,7 @@ index 6a044a9c97db9bba75f8dbbaa8515e3167841855..edd378813873ed367784379b0f1666d1
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 0645fcfa8dd201a41588af7a156a0df838ccb006..8639a9772df6a3064b018f1009f95892e646993e 100644
index 5d90bae91c95617fa39ec3eb643c664cc0123bd8..5229555d9e1114e739641c6e5b07ef2ddc97a252 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -264,6 +264,7 @@ public class ServerPlayer extends Player {
@@ -44,7 +44,7 @@ index 0645fcfa8dd201a41588af7a156a0df838ccb006..8639a9772df6a3064b018f1009f95892
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2643,5 +2646,13 @@ public class ServerPlayer extends Player {
@@ -2645,5 +2648,13 @@ public class ServerPlayer extends Player {
public void tpsBar(boolean tpsBar) {
this.tpsBar = tpsBar;
}