From 73585fe4a9707fb6679a4576d6ca62aa8b2e7e76 Mon Sep 17 00:00:00 2001 From: violetc <58360096+s-yh-china@users.noreply.github.com> Date: Mon, 31 Jul 2023 10:38:24 +0800 Subject: [PATCH] [ci skip] Change download page --- patches/server/0001-Build-changes.patch | 16 +++++++++++----- .../0003-Update-version-fetcher-repo.patch | 4 ++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index fe0f6eb1..4a8bdbdc 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -197,7 +197,7 @@ index a05c1bc8874ef5e380544a6a344c848e37da49c4..22402d237f036be3dcbaea3a63718e61 private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index daed278d1bcf84ee42749f24e311b22b70015d79..35d2da9d91dcdd89de7c0f4af028fd182376ea8d 100644 +index daed278d1bcf84ee42749f24e311b22b70015d79..c9263cf970b82a2ee24d10202c21ac30bfd925dc 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -292,7 +292,7 @@ public class Main { @@ -205,7 +205,7 @@ index daed278d1bcf84ee42749f24e311b22b70015d79..35d2da9d91dcdd89de7c0f4af028fd18 // Paper start - This is some stupid bullshit System.err.println("*** Warning, you've not updated in a while! ***"); - System.err.println("*** Please download a new build as per instructions from https://papermc.io/downloads/paper ***"); // Paper -+ System.err.println("*** Please download a new build as per instructions from https://github.com/LeavesMC/Leaves/releases ***"); //Paper // Leaves ++ System.err.println("*** Please download a new build as per instructions from https://leavesmc.top/downloads/leaves ***"); //Paper // Leaves //System.err.println("*** Server will start in 20 seconds ***"); //Thread.sleep(TimeUnit.SECONDS.toMillis(20)); // Paper End @@ -223,7 +223,7 @@ index 774556a62eb240da42e84db4502e2ed43495be17..ca166161ef919c559de9cc02bdf435cb if (stream != null) { diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 98fba0288be9ed2cb18ffba5cf81148157dd4fcf..ffcc4eff8d7e8cbf031414bd7c0011bb2c0dbb33 100644 +index 98fba0288be9ed2cb18ffba5cf81148157dd4fcf..a803b08d7d1995c263d05eda23dfe4552acae08d 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -155,14 +155,14 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa @@ -237,14 +237,14 @@ index 98fba0288be9ed2cb18ffba5cf81148157dd4fcf..ffcc4eff8d7e8cbf031414bd7c0011bb log.log( Level.SEVERE, "If you see a world save or edit, then it means you did far more than your server can handle at once" ); log.log( Level.SEVERE, "\t If this is the case, consider increasing timeout-time in spigot.yml but note that this will replace the crash with LARGE lag spikes" ); - log.log( Level.SEVERE, "If you are unsure or still think this is a Paper bug, please report this to https://github.com/PaperMC/Paper/issues" ); -+ log.log( Level.SEVERE, "If you are unsure or still think this is a Paper bug, please report this to https://github.com/LeavesMC/Leaves/issues" ); // Leaves ++ log.log( Level.SEVERE, "If you are unsure or still think this is a Leaves bug, please report this to https://github.com/LeavesMC/Leaves/issues" ); // Leaves log.log( Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports" ); - log.log( Level.SEVERE, "Paper version: " + Bukkit.getServer().getVersion() ); + log.log( Level.SEVERE, "Leaves version: " + Bukkit.getServer().getVersion() ); // Leaves // if ( net.minecraft.world.level.Level.lastPhysicsProblem != null ) { -@@ -185,7 +185,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa +@@ -185,12 +185,12 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa // Paper end } else { @@ -253,6 +253,12 @@ index 98fba0288be9ed2cb18ffba5cf81148157dd4fcf..ffcc4eff8d7e8cbf031414bd7c0011bb log.log(Level.SEVERE, "The server has not responded for " + (currentTime - lastTick) / 1000 + " seconds! Creating thread dump"); } // Paper end - Different message for short timeout + log.log( Level.SEVERE, "------------------------------" ); +- 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 Leaves!):" ); // Paper // Leaevs + io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(isLongTimeout); // Paper // Paper - rewrite chunk system + this.dumpTickingInfo(); // Paper - log detailed tick information + WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log ); @@ -206,7 +206,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa WatchdogThread.dumpThread( thread, log ); } diff --git a/patches/server/0003-Update-version-fetcher-repo.patch b/patches/server/0003-Update-version-fetcher-repo.patch index 320c4fcb..4505bec1 100644 --- a/patches/server/0003-Update-version-fetcher-repo.patch +++ b/patches/server/0003-Update-version-fetcher-repo.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Update version fetcher repo diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..902a4a71faeb8c41f89659df0a2a31602b4781a6 100644 +index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..658f32456530cf8f291851da2789c8c3c3de6d27 100644 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java @@ -20,7 +20,7 @@ import java.util.stream.StreamSupport; @@ -13,7 +13,7 @@ index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..902a4a71faeb8c41f89659df0a2a3160 private static final java.util.regex.Pattern VER_PATTERN = java.util.regex.Pattern.compile("^([0-9\\.]*)\\-.*R"); // R is an anchor, will always give '-R' at end private static final String GITHUB_BRANCH_NAME = "master"; - private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads/paper"; -+ private static final String DOWNLOAD_PAGE = "https://github.com/LeavesMC/Leaves/releases"; // Leaves - change ++ private static final String DOWNLOAD_PAGE = "https://leavesmc.top/downloads/leaves"; // Leaves - change private static @Nullable String mcVer; @Override