Make a config reload on init try twice if there is an IOError + fix f…

…or bukkit: don't propagate exceptions, they cause the plugin to be "unloaded", meaning everyone can log in. Signed-off-by: Dries007 <admin@dries007.net>
MCLink-Modding · Feb 20, 2019 · 81a3726 · 81a3726
1 parent f54cb36
commit 81a3726
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 19 deletions.
diff --git a/Bukkit/src/main/java/net/dries007/mclink/MCLink.java b/Bukkit/src/main/java/net/dries007/mclink/MCLink.java
@@ -1,10 +1,9 @@
 /*
- * Copyright (c) 2017 - 2018 Dries007. All rights reserved
+ * Copyright (c) 2017 - 2019 Dries007. All rights reserved
  */
 
 package net.dries007.mclink;
 
-import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableCollection;
 import net.dries007.mclink.api.Authentication;
 import net.dries007.mclink.binding.FormatCode;
@@ -83,28 +82,29 @@ private Player getPlayerFromEntity(org.bukkit.entity.Player player)
     @Override
     public void onEnable()
     {
-        getLogger().setLevel(Level.FINEST);
-
-        common.setModVersion(getDescription().getVersion());
-        common.setMcVersion(Bukkit.getVersion());
-        common.setBranding(Bukkit.getName() + "v" + Bukkit.getBukkitVersion());
-        common.setLogger(new JavaLogger(getLogger()));
-        common.setConfig(new BukkitConfig(this));
-        common.setSide(MCLinkCommon.Side.SERVER);
-
         try
         {
+            getLogger().setLevel(Level.FINEST);
+
+            common.setModVersion(getDescription().getVersion());
+            common.setMcVersion(Bukkit.getVersion());
+            common.setBranding(Bukkit.getName() + "v" + Bukkit.getBukkitVersion());
+            common.setLogger(new JavaLogger(getLogger()));
+            common.setConfig(new BukkitConfig(this));
+            common.setSide(MCLinkCommon.Side.SERVER);
+
             common.init();
+
+            Bukkit.getServer().getPluginManager().registerEvents(this, this);
+            common.registerCommands(e -> getCommand(e.getName()).setExecutor(new CommandWrapper(this, common, e)));
+
+            common.getLogger().info("Enabled");
         }
         catch (Exception e)
         {
-            Throwables.propagate(e);
+            common.getLogger().error("WARNING! Something went wrong initializing... People won't be able to join.");
+            common.getLogger().catching(e);
         }
-
-        Bukkit.getServer().getPluginManager().registerEvents(this, this);
-        common.registerCommands(e -> getCommand(e.getName()).setExecutor(new CommandWrapper(this, common, e)));
-
-        common.getLogger().info("Enabled");
     }
 
     @Override

diff --git a/src/main/java/net/dries007/mclink/common/MCLinkCommon.java b/src/main/java/net/dries007/mclink/common/MCLinkCommon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 - 2018 Dries007. All rights reserved
+ * Copyright (c) 2017 - 2019 Dries007. All rights reserved
  */
 
 package net.dries007.mclink.common;
@@ -62,7 +62,15 @@ public void init() throws IConfig.ConfigException, IOException, APIException
             logger.warn("");
         }
 
-        String warnings = config.reload();
+        String warnings;
+        try
+        {
+            warnings = config.reload();
+        }
+        catch (IOException e)
+        {
+            warnings = config.reload();
+        }
         if (!Strings.isNullOrEmpty(warnings)) logger.warn(warnings);
     }