diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/HMCCosmeticsPlugin.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/HMCCosmeticsPlugin.java index 0e54f707..a5db3632 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/HMCCosmeticsPlugin.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/HMCCosmeticsPlugin.java @@ -61,7 +61,7 @@ public final class HMCCosmeticsPlugin extends JavaPlugin { Metrics metrics = new Metrics(this, pluginId); // NMS version check - if (!NMSHandlers.getHandler().getSupported()) { + if (NMSHandlers.isVersionSupported()) { getLogger().severe("This version is not supported! Consider switching versions?"); getServer().getPluginManager().disablePlugin(this); return; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/nms/NMSHandlers.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/nms/NMSHandlers.java index 60aab9bd..12e286a1 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/nms/NMSHandlers.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/nms/NMSHandlers.java @@ -3,6 +3,7 @@ package com.hibiscusmc.hmccosmetics.nms; import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin; import com.hibiscusmc.hmccosmetics.util.MessagesUtil; import lombok.Getter; +import org.jetbrains.annotations.Nullable; import java.lang.reflect.InvocationTargetException; import java.util.logging.Level; @@ -14,6 +15,7 @@ public class NMSHandlers { @Getter private static String version; + @Nullable public static NMSHandler getHandler() { if (handler != null) { return handler; @@ -23,6 +25,11 @@ public class NMSHandlers { return handler; } + public static boolean isVersionSupported() { + if (getHandler() == null) return false; + return getHandler().getSupported(); + } + public static void setup() { if (handler != null) return; final String packageName = HMCCosmeticsPlugin.getInstance().getServer().getClass().getPackage().getName();