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

12
patches/server/0115-Implement-TPSBar.patch
View File

@@ -41,18 +41,18 @@ index aa85cb619315b327469e6aea92876f47235ce725..7b929d080e5fdd3a535a22a5f9e35955
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 69a1aaa1cf575325bc383921aee6e6e0d7da6057..0a1daa97fc54fbe565de9754594a1fd68ff6652c 100644
index dd83aa83e8d4da4d16e9731f8527cd0f470848e0..9d6733c426c823cfac4da542fd83c5e6832312e1 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -274,6 +274,7 @@ public class ServerPlayer extends Player {
public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
@@ -275,6 +275,7 @@ public class ServerPlayer extends Player {
public @Nullable String clientBrandName = null; // Paper - Brand name
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
// 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));
@@ -561,6 +562,7 @@ public class ServerPlayer extends Player {
@@ -562,6 +563,7 @@ public class ServerPlayer extends Player {
}
}
@@ -60,7 +60,7 @@ index 69a1aaa1cf575325bc383921aee6e6e0d7da6057..0a1daa97fc54fbe565de9754594a1fd6
}
@Override
@@ -627,6 +629,7 @@ public class ServerPlayer extends Player {
@@ -628,6 +630,7 @@ public class ServerPlayer extends Player {
}
this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
@@ -68,7 +68,7 @@ index 69a1aaa1cf575325bc383921aee6e6e0d7da6057..0a1daa97fc54fbe565de9754594a1fd6
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2768,5 +2771,13 @@ public class ServerPlayer extends Player {
@@ -2769,5 +2772,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);
}
}