From 9dcfdf13c206866ec56b4044f4a7905886a669ea Mon Sep 17 00:00:00 2001 From: granny Date: Thu, 16 May 2024 20:04:35 -0700 Subject: [PATCH] [ci skip] missed this from the upstream --- patches/server/0001-Rebrand.patch | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index dc66cbdfe..4725b813b 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -58,7 +58,7 @@ index 4998aff0b7cb084dcda15c6a18bbe45e99b6000a..d23ecfabf6bf1e355fb2efe5abd80236 standardInput = System.`in` workingDir = rootProject.layout.projectDirectory diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -index 532306cacd52579cdf37e4aca25887b1ed3ba6a1..eddc4426301d429968f44d493bae4e71b5969325 100644 +index 532306cacd52579cdf37e4aca25887b1ed3ba6a1..6d36fc6d8e22d9b68dea3830f6ecc8763184c343 100644 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java @@ -35,7 +35,10 @@ public class PaperVersionFetcher implements VersionFetcher { @@ -106,7 +106,7 @@ index 532306cacd52579cdf37e4aca25887b1ed3ba6a1..eddc4426301d429968f44d493bae4e71 .append(Component.newline()) .append(text("Download the new version at: ") .append(text(DOWNLOAD_PAGE, NamedTextColor.GOLD) -@@ -86,15 +89,12 @@ public class PaperVersionFetcher implements VersionFetcher { +@@ -86,18 +89,15 @@ public class PaperVersionFetcher implements VersionFetcher { private static int fetchDistanceFromSiteApi(final ServerBuildInfo build, final int jenkinsBuild) { try { try (final BufferedReader reader = Resources.asCharSource( @@ -124,7 +124,11 @@ index 532306cacd52579cdf37e4aca25887b1ed3ba6a1..eddc4426301d429968f44d493bae4e71 + final int latest = json.getAsJsonObject("builds").getAsJsonPrimitive("latest").getAsInt(); // Purpur return latest - jenkinsBuild; } catch (final JsonSyntaxException ex) { - LOGGER.error("Error parsing json from Paper's downloads API", ex); +- LOGGER.error("Error parsing json from Paper's downloads API", ex); ++ LOGGER.error("Error parsing json from Purpur's downloads API", ex); // Purpur + return DISTANCE_ERROR; + } + } catch (final IOException e) { @@ -141,6 +141,6 @@ public class PaperVersionFetcher implements VersionFetcher { return null; }