Fixed issue where the BukkitVersionHelperSpigot116 would be incorrect…

…ly loaded for newer versions.
gbl · Nov 5, 2020 · c7fa125 · c7fa125
1 parent 426346f
commit c7fa125
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/spigot/src/main/java/org/dynmap/bukkit/Helper.java b/spigot/src/main/java/org/dynmap/bukkit/Helper.java
@@ -14,7 +14,7 @@
 import org.dynmap.bukkit.helper.v116_4.BukkitVersionHelperSpigot116_4;
 
 public class Helper {
-    
+
     public static final BukkitVersionHelper getHelper() {
         if (BukkitVersionHelper.helper == null) {
         	String v = Bukkit.getServer().getVersion();
@@ -29,15 +29,15 @@ public static final BukkitVersionHelper getHelper() {
             else if(v.contains("BukkitForge")) {
                 Log.severe("*********************************************************************************");
                 Log.severe("* BukkitForge is not supported via the Bukkit version of Dynmap.                *");
-                Log.severe("* Install the appropriate Forge version of Dynmap.                              *"); 
+                Log.severe("* Install the appropriate Forge version of Dynmap.                              *");
                 Log.severe("* Add the DynmapCBBridge plugin to enable support for Dynmap-compatible plugins *");
                 Log.severe("*********************************************************************************");
             }
             else if(Bukkit.getServer().getClass().getName().contains("GlowServer")) {
                 Log.info("Loading Glowstone support");
                 BukkitVersionHelper.helper = new BukkitVersionHelperGlowstone();
             }
-            else if (v.contains("(MC: 1.16)") || v.contains("(MC: 1.16.1")) {
+            else if (v.contains("(MC: 1.16.1")) {
                 BukkitVersionHelper.helper = new BukkitVersionHelperSpigot116();
             }
             else if (v.contains("(MC: 1.16.2)")) {
@@ -49,6 +49,10 @@ else if (v.contains("(MC: 1.16.3)")) {
             else if (v.contains("(MC: 1.16.")) {
                 BukkitVersionHelper.helper = new BukkitVersionHelperSpigot116_4();
             }
+            // Loading last to prevent the 1.16 contains to match all newer versions and load older helper incorrectly.
+            else if (v.contains("(MC: 1.16")) {
+                BukkitVersionHelper.helper = new BukkitVersionHelperSpigot116();
+            }
             else if (v.contains("(MC: 1.15)") || v.contains("(MC: 1.15.")) {
                 BukkitVersionHelper.helper = new BukkitVersionHelperSpigot115();
             }