From 17824f237d72eb60ba8613cf2fd062d24e006b3d Mon Sep 17 00:00:00 2001 From: OmerBenGera Date: Sat, 3 Sep 2022 09:23:29 +0300 Subject: [PATCH] Changed it so when failing to retrieve mappings for a version the plugin continues to work instead of failure (#1339) --- build.gradle | 2 +- .../bgsoftware/superiorskyblock/SuperiorSkyblockPlugin.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index e56724ba1..bb9f6b5c6 100644 --- a/build.gradle +++ b/build.gradle @@ -68,7 +68,7 @@ dependencies { implementation 'com.bgsoftware.common.config:CommentedConfiguration:1.0.3' implementation 'com.bgsoftware.common.updater:Updater:latest' - implementation 'com.bgsoftware.common.mappings:MappingsChecker:1.0.0' + implementation 'com.bgsoftware.common.mappings:MappingsChecker:1.0.1' implementation 'com.bgsoftware.common.reflection:ReflectionUtils:1.0.2' implementation 'com.bgsoftware.common.executors:Executors:1.0.1' implementation 'com.bgsoftware.common.remaps:RemapsChecker:1.0.0' diff --git a/src/main/java/com/bgsoftware/superiorskyblock/SuperiorSkyblockPlugin.java b/src/main/java/com/bgsoftware/superiorskyblock/SuperiorSkyblockPlugin.java index 8683f4ad2..1f76be049 100644 --- a/src/main/java/com/bgsoftware/superiorskyblock/SuperiorSkyblockPlugin.java +++ b/src/main/java/com/bgsoftware/superiorskyblock/SuperiorSkyblockPlugin.java @@ -390,7 +390,10 @@ private boolean loadNMSAdapter() { String mappingVersionHash = nmsAlgorithms.getMappingsHash(); - if (mappingVersionHash != null && !MappingsChecker.checkMappings(mappingVersionHash, version)) { + if (mappingVersionHash != null && !MappingsChecker.checkMappings(mappingVersionHash, version, error -> { + log("&cFailed to retrieve allowed mappings for your server, skipping..."); + return true; + })) { new ManagerLoadException("The plugin doesn't support your version mappings.\nPlease try a different version.\n" + "Mappings Hash: " + mappingVersionHash, ManagerLoadException.ErrorLevel.SERVER_SHUTDOWN).printStackTrace(); return false;