From 8ff1ebd7c2792bf5d7f67629063fa78d223a837e Mon Sep 17 00:00:00 2001 From: Josh Roy <10731363+JRoy@users.noreply.github.com> Date: Tue, 25 Jun 2019 02:18:16 -0400 Subject: [PATCH] Fix version regex on 1.14.3 (#2622) @JRoy --- .../src/com/earth2me/essentials/utils/VersionUtil.java | 5 +++-- Essentials/test/com/earth2me/essentials/UtilTest.java | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/utils/VersionUtil.java b/Essentials/src/com/earth2me/essentials/utils/VersionUtil.java index 61e1879f2..da5f44ced 100644 --- a/Essentials/src/com/earth2me/essentials/utils/VersionUtil.java +++ b/Essentials/src/com/earth2me/essentials/utils/VersionUtil.java @@ -23,8 +23,9 @@ public class VersionUtil { public static final BukkitVersion v1_14_R01 = BukkitVersion.fromString("1.14-R0.1-SNAPSHOT"); public static final BukkitVersion v1_14_1_R01 = BukkitVersion.fromString("1.14.1-R0.1-SNAPSHOT"); public static final BukkitVersion v1_14_2_R01 = BukkitVersion.fromString("1.14.2-R0.1-SNAPSHOT"); + public static final BukkitVersion v1_14_3 = BukkitVersion.fromString("1.14.3-SNAPSHOT"); - private static final Set supportedVersions = ImmutableSet.of(v1_8_8_R01, v1_9_4_R01, v1_10_2_R01, v1_11_2_R01, v1_12_2_R01, v1_13_2_R01, v1_14_2_R01); + private static final Set supportedVersions = ImmutableSet.of(v1_8_8_R01, v1_9_4_R01, v1_10_2_R01, v1_11_2_R01, v1_12_2_R01, v1_13_2_R01, v1_14_3); private static BukkitVersion serverVersion = null; @@ -40,7 +41,7 @@ public class VersionUtil { } public static class BukkitVersion implements Comparable { - private static final Pattern VERSION_PATTERN = Pattern.compile("^(\\d+)\\.(\\d+)\\.?([0-9]*)?-(?:pre(\\d))?-?R?([\\d.]+)?(?:-SNAPSHOT)?"); + private static final Pattern VERSION_PATTERN = Pattern.compile("^(\\d+)\\.(\\d+)\\.?([0-9]*)?(?:-pre(\\d))?(?:-?R?([\\d.]+))?(?:-SNAPSHOT)?"); private final int major; private final int minor; diff --git a/Essentials/test/com/earth2me/essentials/UtilTest.java b/Essentials/test/com/earth2me/essentials/UtilTest.java index 4b21ef615..5fc56e2b5 100644 --- a/Essentials/test/com/earth2me/essentials/UtilTest.java +++ b/Essentials/test/com/earth2me/essentials/UtilTest.java @@ -216,5 +216,11 @@ public class UtilTest extends TestCase { assertEquals(v.getPatch(), 2); assertEquals(v.getRevision(), 0.1); assertEquals(v.getPrerelease(), 1); + v = VersionUtil.BukkitVersion.fromString("1.14.3-SNAPSHOT"); + assertEquals(v.getMajor(), 1); + assertEquals(v.getMinor(), 14); + assertEquals(v.getPatch(), 3); + assertEquals(v.getRevision(), 0.0); + assertEquals(v.getPrerelease(), -1); } }