Fix compilation issues (#1509)

This commit is contained in:
Krakenied
2024-04-28 22:23:25 +02:00
committed by GitHub
parent 9d2dae3c9c
commit dc9993f4d1
36 changed files with 207 additions and 258 deletions

View File

@@ -41,7 +41,7 @@ index 6d47aa73788eef78aa6714384db879b4e907de9b..8a132fcdeb620d2e7f1c0c8b9e592ff2
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index fe250c154aed8b10e33c6b916cabedb0dda3d5d6..fabce29a8e4eefede38dabd009c0ab9f9c1dc842 100644
index fe250c154aed8b10e33c6b916cabedb0dda3d5d6..4077269113e6f2369194e2372d415f2f6737317c 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -299,6 +299,7 @@ public class ServerPlayer extends Player {
@@ -60,15 +60,7 @@ index fe250c154aed8b10e33c6b916cabedb0dda3d5d6..fabce29a8e4eefede38dabd009c0ab9f
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -1182,6 +1184,7 @@ public class ServerPlayer extends Player {
}
}
+ if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur
}
@Override
@@ -2986,5 +2989,13 @@ public class ServerPlayer extends Player {
@@ -2986,5 +2988,13 @@ public class ServerPlayer extends Player {
this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck, org.bukkit.event.player.PlayerRespawnEvent.RespawnReason.DEATH);
}
}