Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@adb4fb4 [ci skip] update mappings link (#9801)
PaperMC/Paper@a702a08 Move clientBrandName over to ServerPlayer (#9809)
This commit is contained in:
granny
2023-10-08 23:21:21 -07:00
parent be959650a5
commit 69d6fae064
19 changed files with 61 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0195-Add-compass-command.patch
View File

@@ -17,10 +17,10 @@ index e254f7c498c5a1608afe130b2dd4d3d037069f25..af712f089e7919fa0bd3946866fd3486
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 0e176fbe456681be0ca3f6b6747bb60178c1f864..0ea215df4ef613646fe48db36d4151b24f478484 100644
index 97317911fac30d1f762291d0d615e004384a9b6f..e7c90ce23a68cbf4b44a750f2dafc06c19e5fb06 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -275,6 +275,7 @@ public class ServerPlayer extends Player {
@@ -276,6 +276,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
public boolean purpurClient = false; // Purpur
private boolean tpsBar = false; // Purpur
@@ -28,7 +28,7 @@ index 0e176fbe456681be0ca3f6b6747bb60178c1f864..0ea215df4ef613646fe48db36d4151b2
// Paper start - replace player chunk loader
private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
@@ -563,6 +564,7 @@ public class ServerPlayer extends Player {
@@ -564,6 +565,7 @@ public class ServerPlayer extends Player {
}
if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur
@@ -36,7 +36,7 @@ index 0e176fbe456681be0ca3f6b6747bb60178c1f864..0ea215df4ef613646fe48db36d4151b2
}
@Override
@@ -630,6 +632,7 @@ public class ServerPlayer extends Player {
@@ -631,6 +633,7 @@ public class ServerPlayer extends Player {
this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
@@ -44,7 +44,7 @@ index 0e176fbe456681be0ca3f6b6747bb60178c1f864..0ea215df4ef613646fe48db36d4151b2
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2793,5 +2796,13 @@ public class ServerPlayer extends Player {
@@ -2794,5 +2797,13 @@ public class ServerPlayer extends Player {
public void tpsBar(boolean tpsBar) {
this.tpsBar = tpsBar;
}