From 9030575af3aad201072770067d7fba5abc745312 Mon Sep 17 00:00:00 2001 From: granny Date: Fri, 19 Sep 2025 18:00:39 -0700 Subject: [PATCH] [ci skip] a little bit of cleanup --- purpur-api/build.gradle.kts.patch | 3 +-- .../sources/net/minecraft/server/MinecraftServer.java.patch | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/purpur-api/build.gradle.kts.patch b/purpur-api/build.gradle.kts.patch index dd2499f35..ed7624c6c 100644 --- a/purpur-api/build.gradle.kts.patch +++ b/purpur-api/build.gradle.kts.patch @@ -28,11 +28,10 @@ } } } -@@ -165,8 +_,10 @@ +@@ -165,8 +_,9 @@ val services = objects.newInstance() tasks.withType().configureEach { -+ //(options as StandardJavadocDocletOptions).addStringOption("-add-modules", "jdk.incubator.vector") // Purpur - our javadocs need this for pufferfish's SIMD patch + (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet") // Purpur - silence Paper's bajillion javadoc warnings val options = options as StandardJavadocDocletOptions - options.overview = "src/main/javadoc/overview.html" diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch index 7b0c83d5c..9105063d9 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch @@ -104,7 +104,7 @@ this.mayHaveDelayedTasks = true; this.delayedTasksMaxNextTickTimeNanos = Math.max(Util.getNanos() + l, this.nextTickTimeNanos); + // Purpur start - Configurable TPS Catchup -+ if (!org.purpurmc.purpur.PurpurConfig.tpsCatchup /*|| !gg.pufferfish.pufferfish.PufferfishConfig.tpsCatchup*/) { // Purpur - Configurable TPS Catchup ++ if (!org.purpurmc.purpur.PurpurConfig.tpsCatchup) { + this.nextTickTimeNanos = currentTime + l; + this.delayedTasksMaxNextTickTimeNanos = nextTickTimeNanos; + }