Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17: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@f7124df Fix recursive chunk loading in chunk unload event
PaperMC/Paper@8b558d9 Apply entity tracker desync patch
PaperMC/Paper@a594d18 Fix entities not being visible to clients when teleporting
PaperMC/Paper@f250ec0 Increment ChunkHolderManager current tick
PaperMC/Paper@7bd22b1 Optimise entity tracker
PaperMC/Paper@90ae1dc Port collision optimisation patch from Moonrise
PaperMC/Paper@821081d Drop unapplied patches
PaperMC/Paper@1d0fcb5 Port lag compensation patch
PaperMC/Paper@0e02aa5 Port watchdog detail patch
PaperMC/Paper@c6e9579 Fix explosions calculation getting stuck (#11061)
PaperMC/Paper@2773dc4 Add light block to indestructible block list
PaperMC/Paper@70ff1ec Only skip damage tick if damage is unmodified zero (#11058)
This commit is contained in:
granny
2024-07-12 03:56:05 -07:00
parent b3709b1f4d
commit 5e70800f80
49 changed files with 263 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0001-Rebrand.patch
View File

@@ -214,10 +214,10 @@ index b24265573fdef5d9a964bcd76146f34542c420cf..710477ae27ebc5afdf0012ef0867d05e
public SystemReport getSystemReport() {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 330bee331335454a61cf8350a6654217c8124445..646d1947351eb9dea1e301698ed4a03a96e03f8a 100644
index 54e581db732c3a104142a2bbc228ecbe16aec0fc..f5b725dcd132bdc5bba73211d3891599eddc119b 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1028,7 +1028,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1029,7 +1029,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
shutdownThread = Thread.currentThread();
org.spigotmc.WatchdogThread.doStop(); // Paper
if (!isSameThread()) {
@@ -293,10 +293,10 @@ index 774556a62eb240da42e84db4502e2ed43495be17..99597258e8e88cd9e2c901c4ac3ff7fa
if (stream != null) {
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
index e5e41dc2d4f7a8c3fea704212507ca0b951664db..71777757fc00dfb2f91abecc4443b65782e78300 100644
index f947b542b21189ab8324d54d965364aa283d7cb7..abe225593d325afee56f5b3a8f75aafc42a4560b 100644
--- a/src/main/java/org/spigotmc/WatchdogThread.java
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
@@ -24,7 +24,7 @@ public class WatchdogThread extends Thread
@@ -96,7 +96,7 @@ public class WatchdogThread extends Thread
private WatchdogThread(long timeoutTime, boolean restart)
{
@@ -305,7 +305,7 @@ index e5e41dc2d4f7a8c3fea704212507ca0b951664db..71777757fc00dfb2f91abecc4443b657
this.timeoutTime = timeoutTime;
this.restart = restart;
earlyWarningEvery = Math.min(io.papermc.paper.configuration.GlobalConfiguration.get().watchdog.earlyWarningEvery, timeoutTime); // Paper
@@ -83,14 +83,14 @@ public class WatchdogThread extends Thread
@@ -155,14 +155,14 @@ public class WatchdogThread extends Thread
if (isLongTimeout) {
// Paper end
log.log( Level.SEVERE, "------------------------------" );
@@ -323,7 +323,7 @@ index e5e41dc2d4f7a8c3fea704212507ca0b951664db..71777757fc00dfb2f91abecc4443b657
//
if ( net.minecraft.world.level.Level.lastPhysicsProblem != null )
{
@@ -112,12 +112,12 @@ public class WatchdogThread extends Thread
@@ -184,12 +184,12 @@ public class WatchdogThread extends Thread
// Paper end
} else
{
@@ -336,9 +336,9 @@ index e5e41dc2d4f7a8c3fea704212507ca0b951664db..71777757fc00dfb2f91abecc4443b657
- log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper
+ log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Purpur!):" ); // Paper // Purpur
ca.spottedleaf.moonrise.patches.chunk_system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(MinecraftServer.getServer(), isLongTimeout); // Paper - rewrite chunk system
this.dumpTickingInfo(); // Paper - log detailed tick information
WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
log.log( Level.SEVERE, "------------------------------" );
@@ -132,7 +132,7 @@ public class WatchdogThread extends Thread
@@ -205,7 +205,7 @@ public class WatchdogThread extends Thread
WatchdogThread.dumpThread( thread, log );
}
} else {