Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47:42 +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@6d63005 Fix setEggCount method from TurtleLayEggEvent (#8385)
PaperMC/Paper@abe53a7 Fix typos in isTickingWorlds API javadocs (#8382)
PaperMC/Paper@01a1387 Rewrite chunk system (#8177)
This commit is contained in:
BillyGalbreath
2022-09-26 04:35:03 -05:00
parent 3e02573ea0
commit 478d55ec4d
57 changed files with 467 additions and 2913 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0125-Implement-TPSBar.patch
View File

@@ -17,10 +17,10 @@ index ab0f00128f8c1b13c3eb5787df0c4e26372e0734..14b12cb6967c1c2735cf6a0eafdf6e23
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 635e02597e8f57f80eadc1ec78d87b9742c01406..10f33aed80fd963accbac1f43fd9b392d4452fb9 100644
index 68db8421f5e80301423c2f1d4394ef1f9cca38be..03d0cc6c69164e196d5db2bf56a7136a9e4a5c79 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1050,6 +1050,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1022,6 +1022,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.safeShutdown(flag, false);
}
public void safeShutdown(boolean flag, boolean isRestarting) {
@@ -29,7 +29,7 @@ index 635e02597e8f57f80eadc1ec78d87b9742c01406..10f33aed80fd963accbac1f43fd9b392
this.hasLoggedStop = true; // Paper
if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 629024e5c3f480bd50ae2df9dadb72f06a62c3bf..19bf680e222d7f91a0e7f67b29e3a5e38a35c1e7 100644
index a18abdcbc51f3b6fda96a4f6dd8674521338f37f..f69d1f11fffbca1ddd297e3793f1bcfe34f2a200 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -351,6 +351,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -41,18 +41,18 @@ index 629024e5c3f480bd50ae2df9dadb72f06a62c3bf..19bf680e222d7f91a0e7f67b29e3a5e3
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 6036db50f05e8658f645848e03b276a1352a9424..e8663f8f23f71cfabde12585c6d9bc8215eb21e3 100644
index e619420b635d41ed564493ed0b28b3d06fbd86e1..ca7199452cbfc7d18203eae17c417c829c3b39bf 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -264,6 +264,7 @@ public class ServerPlayer extends Player {
@@ -263,6 +263,7 @@ public class ServerPlayer extends Player {
public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
public boolean purpurClient = false; // Purpur
public boolean acceptingResourcePack = false; // Purpur
+ private boolean tpsBar = false; // Purpur
public boolean isRealPlayer; // Paper
public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
@@ -485,6 +486,7 @@ public class ServerPlayer extends Player {
@@ -470,6 +471,7 @@ public class ServerPlayer extends Player {
}
}
@@ -60,7 +60,7 @@ index 6036db50f05e8658f645848e03b276a1352a9424..e8663f8f23f71cfabde12585c6d9bc82
}
@Override
@@ -545,6 +547,7 @@ public class ServerPlayer extends Player {
@@ -530,6 +532,7 @@ public class ServerPlayer extends Player {
}
this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
@@ -68,7 +68,7 @@ index 6036db50f05e8658f645848e03b276a1352a9424..e8663f8f23f71cfabde12585c6d9bc82
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2614,5 +2617,13 @@ public class ServerPlayer extends Player {
@@ -2597,5 +2600,13 @@ public class ServerPlayer extends Player {
this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck);
}
}
@@ -83,7 +83,7 @@ index 6036db50f05e8658f645848e03b276a1352a9424..e8663f8f23f71cfabde12585c6d9bc82
// Purpur end
}
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 08aa692b8f80ace6ce552e78476a76220d6d00eb..3d777aae5a91190e1c3bde234bc53a56fdf3c414 100644
index d0db1623c8132eb4c9a51b6e452280c56f544bf5..8182e9d69083ade08ae0b9c0512b8b7b48de3655 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -503,6 +503,7 @@ public abstract class PlayerList {