mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Track correct branch for /version

Browse source
This commit is contained in:
Shane Freeder 2019-12-13 22:56:02 +00:00
parent 7dbceea208
commit bc447dc137
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Spigot-Server-Patches/0018-Implement-Paper-VersionChecker.patch
View file

@ -1,4 +1,4 @@
From 66daf1aec0b98f36b7b650ab202b7284d518035a Mon Sep 17 00:00:00 2001 From 2d3fd16046dd4deee5a2cd2f7f5cac0bf53c138e Mon Sep 17 00:00:00 2001
From: Zach Brown <zach@zachbr.io> From: Zach Brown <zach@zachbr.io>
Date: Mon, 27 May 2019 03:40:05 -0500 Date: Mon, 27 May 2019 03:40:05 -0500
Subject: [PATCH] Implement Paper VersionChecker Subject: [PATCH] Implement Paper VersionChecker
@ -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 diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
new file mode 100644 new file mode 100644
index 000000000..ded51d042 index 000000000..5deed3e25
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
@@ -0,0 +1,115 @@ @@ -0,0 +1,115 @@
@ -25,7 +25,7 @@ index 000000000..ded51d042
+ +
+public class PaperVersionFetcher implements VersionFetcher { +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 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; + private static @Nullable String mcVer;
+ +
+ @Override + @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 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 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -293,6 +293,11 @@ public final class CraftMagicNumbers implements UnsafeValues { @@ -293,6 +293,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
@ -142,5 +142,5 @@ index 2733c63aa..1b8d94d29 100644
/** /**
-- --
2.22.0 2.24.1