From 9bb17addcd7f6be1f839267fa0f2106ef792d8a3 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 13 Dec 2019 22:56:02 +0000 Subject: [PATCH] Track correct branch for /version --- Spigot-Server-Patches/Implement-Paper-VersionChecker.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Spigot-Server-Patches/Implement-Paper-VersionChecker.patch b/Spigot-Server-Patches/Implement-Paper-VersionChecker.patch index a983db5c9a..90eb3bfe16 100644 --- a/Spigot-Server-Patches/Implement-Paper-VersionChecker.patch +++ b/Spigot-Server-Patches/Implement-Paper-VersionChecker.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Implement Paper VersionChecker diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java new file mode 100644 -index 000000000..ded51d042 +index 000000000..5deed3e25 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java @@ -0,0 +0,0 @@ @@ -25,7 +25,7 @@ index 000000000..ded51d042 + +public class PaperVersionFetcher implements VersionFetcher { + 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 = "ver/1.14"; ++ private static final String GITHUB_BRANCH_NAME = "master"; + private static @Nullable String mcVer; + + @Override @@ -126,7 +126,7 @@ index 000000000..ded51d042 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 2733c63aa..1b8d94d29 100644 +index 48a191ae0..21bfdf9e7 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -0,0 +0,0 @@ public final class CraftMagicNumbers implements UnsafeValues {