Fix server crashing if mod throws exception during initialisation

Author: LMBishop

bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/CSSMinecraftLoader.java

@@ -1,5 +1,6 @@
 package com.cssbham.cssminecraft.bukkit;
 
+import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
 
 /**
@@ -15,7 +16,12 @@ public CSSMinecraftLoader() {
 
     @Override
     public void onEnable() {
-        plugin.enable();
+        try {
+            plugin.enable();
+        } catch (Exception e) {
+            plugin.getLogger().severe("Plugin initialisation failed - disabling");
+            Bukkit.getPluginManager().disablePlugin(this);
+        }
     }
 
     @Override

common/src/main/java/com/cssbham/cssminecraft/common/AbstractCSSMinecraftPlugin.java

@@ -47,7 +47,12 @@ public void enable() {
         this.eventBus = new SimpleEventBus(logger);
 
         this.discordClientService = new DiscordClientService(configService, eventBus, logger);
-        discordClientService.initialiseClients();
+        try {
+            discordClientService.initialiseClients();
+        } catch (Exception e) {
+            logger.severe(String.format("Failed to initialise Discord clients: %s", e.getMessage()));
+            throw e;
+        }
 
         eventBus.subscribe(ServerMessageEvent.class, new ServerMessageEventHandler(discordClientService));
         eventBus.subscribe(PlayerJoinEvent.class, new PlayerJoinEventHandler(discordClientService));

fabric/src/main/java/com/cssbham/cssminecraft/fabric/CSSMinecraftLoader.java

@@ -23,7 +23,12 @@ public void onInitializeServer() {
 
     private void onStart(MinecraftServer server) {
         this.plugin.setServer(server);
-        this.plugin.enable();
+        try {
+            this.plugin.enable();
+        } catch (Exception e) {
+            this.plugin.getLogger().severe("Mod initialisation failed - disabling");
+            this.plugin.disable();
+        }
     }
 
     private void onStop(MinecraftServer server) {

forge/src/main/java/com/cssbham/cssminecraft/forge/CSSMinecraftLoader.java

@@ -1,7 +1,8 @@
 package com.cssbham.cssminecraft.forge;
 
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.server.ServerStartedEvent;
+import net.minecraftforge.event.server.ServerStartingEvent;
+import net.minecraftforge.event.server.ServerStoppingEvent;
 import net.minecraftforge.fml.common.Mod;
 
 /**
@@ -17,9 +18,18 @@ public CSSMinecraftLoader() {
         MinecraftForge.EVENT_BUS.addListener(this::onServerStarted);
     }
 
-    public void onServerStarted(ServerStartedEvent event) {
+    public void onServerStarted(ServerStartingEvent event) {
         this.plugin.setServer(event.getServer());
-        this.plugin.enable();
+        try {
+            this.plugin.enable();
+        } catch (Exception e) {
+            this.plugin.getLogger().severe("Mod initialisation failed - disabling");
+            this.plugin.disable();
+        }
+    }
+
+    public void onServerStopping(ServerStoppingEvent event) {
+        this.plugin.disable();
     }
 
 }