mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-22 00:19:20 +00:00
Updated Upstream (Gale)
This commit is contained in:
@@ -20,10 +20,10 @@ index 5ddaaf3b50b6483143e21f278d3fd732429e64d4..e94bcacae678b70a61c428dd307b860a
|
||||
|
||||
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 f0cf0f82920e09a984c8c3dbb131103beb327163..807bae553cf0008e3ca328b85fb210dc6a929fde 100644
|
||||
index 2214f3542f9ee8b6fd971eeb02ed7d0e87b6a1d8..28dc9687c43d03a88fab2f525ea48e8c375bcc9a 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
@@ -277,6 +277,7 @@ public class ServerPlayer extends Player {
|
||||
@@ -278,6 +278,7 @@ public class ServerPlayer extends Player {
|
||||
public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event
|
||||
private boolean tpsBar = false; // Purpur
|
||||
private boolean compassBar = false; // Purpur
|
||||
@@ -31,7 +31,7 @@ index f0cf0f82920e09a984c8c3dbb131103beb327163..807bae553cf0008e3ca328b85fb210dc
|
||||
|
||||
public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
|
||||
super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
|
||||
@@ -515,6 +516,7 @@ public class ServerPlayer extends Player {
|
||||
@@ -516,6 +517,7 @@ public class ServerPlayer extends Player {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -39,7 +39,7 @@ index f0cf0f82920e09a984c8c3dbb131103beb327163..807bae553cf0008e3ca328b85fb210dc
|
||||
if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur
|
||||
if (nbt.contains("Purpur.CompassBar")) { this.compassBar = nbt.getBoolean("Purpur.CompassBar"); } // Purpur
|
||||
}
|
||||
@@ -583,6 +585,7 @@ public class ServerPlayer extends Player {
|
||||
@@ -584,6 +586,7 @@ public class ServerPlayer extends Player {
|
||||
}
|
||||
this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
|
||||
|
||||
@@ -47,7 +47,7 @@ index f0cf0f82920e09a984c8c3dbb131103beb327163..807bae553cf0008e3ca328b85fb210dc
|
||||
nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
|
||||
nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur
|
||||
}
|
||||
@@ -2566,5 +2569,14 @@ public class ServerPlayer extends Player {
|
||||
@@ -2577,5 +2580,14 @@ public class ServerPlayer extends Player {
|
||||
public void compassBar(boolean compassBar) {
|
||||
this.compassBar = compassBar;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user