fix nullpointers when plugin fails to load

WhipDevelopment · Feb 2, 2024 · 60219c7 · 60219c7
1 parent e2bae3c
commit 60219c7
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/main/java/net/crashcraft/crashclaim/CrashClaim.java b/src/main/java/net/crashcraft/crashclaim/CrashClaim.java
@@ -81,6 +81,13 @@ public void onLoad() {
 
     @Override
     public void onEnable() {
+
+        String bukkitVersion = Bukkit.getBukkitVersion();
+        if (!bukkitVersion.matches("1\\.20\\.\\d+.*")) {
+            getLogger().severe("Incompatible server version: " + bukkitVersion);
+            getServer().getPluginManager().disablePlugin(this);
+        }
+
         Bukkit.getPluginManager().registerEvents(pluginSupport, this);
 
         taskChainFactory = BukkitTaskChainFactory.create(this);
@@ -130,13 +137,6 @@ public void onEnable() {
 
         Bukkit.getServicesManager().register(PaymentProvider.class, payment.getProvider(), plugin, ServicePriority.Normal);
 
-        String bukkitVersion = Bukkit.getBukkitVersion();
-        if (!bukkitVersion.matches("1\\.20\\.\\d+.*")) {
-            getLogger().severe("Incompatible server version: " + bukkitVersion);
-            getServer().getPluginManager().disablePlugin(this);
-        }
-
-
         if (GlobalConfig.useStatistics) {
             getLogger().info("Enabling Statistics");
             Metrics metrics = new Metrics(this, 12015);
@@ -157,7 +157,7 @@ public void onDisable() {
 
         //Unregister all user facing things
         HandlerList.unregisterAll(this);
-        commandManager.getCommandManager().unregisterCommands();
+        if (commandManager != null) commandManager.getCommandManager().unregisterCommands();
         for (Player player : Bukkit.getOnlinePlayers()){
             if (player.getOpenInventory().getTopInventory().getHolder() instanceof GUI){
                 player.closeInventory();