Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 450-new-settings-rewrite

Conflicts: src/main/java/fr/xephi/authme/AuthMe.java src/main/java/fr/xephi/authme/settings/Settings.java src/main/java/fr/xephi/authme/settings/custom/NewSetting.java
2016-02-05 23:28:06 +01:00
parent ab719c4204 a103aee4da
commit 85868ca830
23 changed files with 245 additions and 315 deletions
@@ -24,8 +24,7 @@ public class ReloadCommand implements ExecutableCommand {
            commandService.send(sender, MessageKey.CONFIG_RELOAD_SUCCESS);
        } catch (Exception e) {
            sender.sendMessage("Error occurred during reload of AuthMe: aborting");
-            ConsoleLogger.showError("Fatal error occurred! AuthMe instance ABORTED!");
-            ConsoleLogger.writeStackTrace(e);
+            ConsoleLogger.logException("Aborting! Encountered exception during reload of AuthMe:", e);
            plugin.stopOrUnload();
        }
    }