Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-24 03:05:28 +01:00
Code Issues Projects Releases Wiki Activity

Fixed issue where the BukkitVersionHelperSpigot116 would be incorrectly loaded for newer versions.

Browse Source
This commit is contained in:
Thomas Janssen 2020-11-05 09:52:33 +01:00
parent 426346f48a
commit c7fa125bdc
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spigot/src/main/java/org/dynmap/bukkit/Helper.java
View File

@ -14,7 +14,7 @@ import org.dynmap.bukkit.helper.v116_3.BukkitVersionHelperSpigot116_3;
import org.dynmap.bukkit.helper.v116_4.BukkitVersionHelperSpigot116_4; import org.dynmap.bukkit.helper.v116_4.BukkitVersionHelperSpigot116_4;
public class Helper { public class Helper {
public static final BukkitVersionHelper getHelper() { public static final BukkitVersionHelper getHelper() {
if (BukkitVersionHelper.helper == null) { if (BukkitVersionHelper.helper == null) {
String v = Bukkit.getServer().getVersion(); String v = Bukkit.getServer().getVersion();
@ -29,7 +29,7 @@ public class Helper {
else if(v.contains("BukkitForge")) { else if(v.contains("BukkitForge")) {
Log.severe("*********************************************************************************"); Log.severe("*********************************************************************************");
Log.severe("* BukkitForge is not supported via the Bukkit version of Dynmap. *"); 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("* Add the DynmapCBBridge plugin to enable support for Dynmap-compatible plugins *");
Log.severe("*********************************************************************************"); Log.severe("*********************************************************************************");
} }
@ -37,7 +37,7 @@ public class Helper {
Log.info("Loading Glowstone support"); Log.info("Loading Glowstone support");
BukkitVersionHelper.helper = new BukkitVersionHelperGlowstone(); 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(); BukkitVersionHelper.helper = new BukkitVersionHelperSpigot116();
} }
else if (v.contains("(MC: 1.16.2)")) { else if (v.contains("(MC: 1.16.2)")) {
@ -49,6 +49,10 @@ public class Helper {
else if (v.contains("(MC: 1.16.")) { else if (v.contains("(MC: 1.16.")) {
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot116_4(); 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.")) { else if (v.contains("(MC: 1.15)") || v.contains("(MC: 1.15.")) {
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot115(); BukkitVersionHelper.helper = new BukkitVersionHelperSpigot115();
} }