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
@@ -36,7 +36,7 @@ public class GeoLiteAPI {
                plugin.getLogger().info(LICENSE);
                return true;
            } catch (IOException e) {
-                // TODO ljacqu 20151123: Log the exception instead of just swallowing it
+            	ConsoleLogger.logException("Could not find/download GeoLiteAPI", e);
                return false;
            }
        }
@@ -63,7 +63,7 @@ public class GeoLiteAPI {
                    output.close();
                    input.close();
                } catch (IOException e) {
-                    ConsoleLogger.writeStackTrace(e);
+                    ConsoleLogger.logException("Could not download GeoLiteAPI", e);
                }
            }
        });