Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper), closes #1556

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

Paper Changes:
PaperMC/Paper@2288e13 Update last chunk position in findSupportingBlock
PaperMC/Paper@1595e4a Make watchdog thread extend TickThread again
PaperMC/Paper@34a2917 Add default canUse and permission methods to BasicCommand (#11047)
PaperMC/Paper@99ae7bb Don't require author and title to be set on signed book meta (#11068)
This commit is contained in:
granny
2024-07-14 20:33:40 -07:00
parent 14136b85d1
commit 458dc187f9
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 f947b542b21189ab8324d54d965364aa283d7cb7..abe225593d325afee56f5b3a8f75aafc42a4560b 100644
index 5e583d7226ce60d965ce9f019900793d45742d30..08230ef6a705904440a677fba4c65386a3f540ed 100644
--- a/src/main/java/org/spigotmc/WatchdogThread.java
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
@@ -96,7 +96,7 @@ public class WatchdogThread extends Thread
@@ -96,7 +96,7 @@ public class WatchdogThread extends io.papermc.paper.util.TickThread // Paper -
private WatchdogThread(long timeoutTime, boolean restart)
{
@@ -305,7 +305,7 @@ index f947b542b21189ab8324d54d965364aa283d7cb7..abe225593d325afee56f5b3a8f75aafc
this.timeoutTime = timeoutTime;
this.restart = restart;
earlyWarningEvery = Math.min(io.papermc.paper.configuration.GlobalConfiguration.get().watchdog.earlyWarningEvery, timeoutTime); // Paper
@@ -155,14 +155,14 @@ public class WatchdogThread extends Thread
@@ -155,14 +155,14 @@ public class WatchdogThread extends io.papermc.paper.util.TickThread // Paper -
if (isLongTimeout) {
// Paper end
log.log( Level.SEVERE, "------------------------------" );
@@ -323,7 +323,7 @@ index f947b542b21189ab8324d54d965364aa283d7cb7..abe225593d325afee56f5b3a8f75aafc
//
if ( net.minecraft.world.level.Level.lastPhysicsProblem != null )
{
@@ -184,12 +184,12 @@ public class WatchdogThread extends Thread
@@ -184,12 +184,12 @@ public class WatchdogThread extends io.papermc.paper.util.TickThread // Paper -
// Paper end
} else
{
@@ -338,7 +338,7 @@ index f947b542b21189ab8324d54d965364aa283d7cb7..abe225593d325afee56f5b3a8f75aafc
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 );
@@ -205,7 +205,7 @@ public class WatchdogThread extends Thread
@@ -205,7 +205,7 @@ public class WatchdogThread extends io.papermc.paper.util.TickThread // Paper -
WatchdogThread.dumpThread( thread, log );
}
} else {