Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@d5f1ffc Remove somewhat broken patch
This commit is contained in:
BillyGalbreath
2022-12-19 11:11:49 -06:00
parent e2365fa207
commit 4a580c4122
39 changed files with 181 additions and 181 deletions

View File

@@ -17,10 +17,10 @@ index b779b4a7118fbcc24752369a5944536f5ecccaf1..244f5b5a7a7e781c27d21477d798f65f
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 f0923a7b1db1a77764dd13f1b2c86a5f4b76b555..db7bf36474ac0e0a95b11ab212d9c866368a161b 100644
index 4d984fc18bba2da2dd709440dbf845ee1586f677..3f642a1a6d74d80d78e06441b50769810b820364 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -273,6 +273,7 @@ public class ServerPlayer extends Player {
@@ -271,6 +271,7 @@ public class ServerPlayer extends Player {
public boolean purpurClient = false; // Purpur
public boolean acceptingResourcePack = false; // Purpur
private boolean tpsBar = false; // Purpur
@@ -28,7 +28,7 @@ index f0923a7b1db1a77764dd13f1b2c86a5f4b76b555..db7bf36474ac0e0a95b11ab212d9c866
public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
@@ -513,6 +514,7 @@ public class ServerPlayer extends Player {
@@ -511,6 +512,7 @@ public class ServerPlayer extends Player {
}
if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur
@@ -36,7 +36,7 @@ index f0923a7b1db1a77764dd13f1b2c86a5f4b76b555..db7bf36474ac0e0a95b11ab212d9c866
}
@Override
@@ -580,6 +582,7 @@ public class ServerPlayer extends Player {
@@ -578,6 +580,7 @@ public class ServerPlayer extends Player {
this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
@@ -44,7 +44,7 @@ index f0923a7b1db1a77764dd13f1b2c86a5f4b76b555..db7bf36474ac0e0a95b11ab212d9c866
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2697,5 +2700,13 @@ public class ServerPlayer extends Player {
@@ -2695,5 +2698,13 @@ public class ServerPlayer extends Player {
public void tpsBar(boolean tpsBar) {
this.tpsBar = tpsBar;
}