From 8f446fa6af459411635b9299c4ee5c209244ad80 Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Wed, 23 Sep 2015 22:10:11 +0200
Subject: [PATCH] Fix settings (i hope)

---
 src/main/java/fr/xephi/authme/AuthMe.java                      | 3 +--
 src/main/java/fr/xephi/authme/converter/ForceFlatToSqlite.java | 3 ---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index dc797d0cf..6e11d6122 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -1,7 +1,6 @@
 package fr.xephi.authme;
 
 import com.earth2me.essentials.Essentials;
-import com.maxmind.geoip.LookupService;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import fr.xephi.authme.api.API;
 import fr.xephi.authme.api.NewAPI;
@@ -119,7 +118,7 @@ public class AuthMe extends JavaPlugin {
         // TODO: new configuration style (more files)
         try {
             settings = new Settings(this);
-            settings.reload();
+            Settings.reload();
         } catch (Exception e) {
             ConsoleLogger.writeStackTrace(e);
             ConsoleLogger.showError("Can't load the configuration file... Something went wrong, to avoid security issues the server will shutdown!");
diff --git a/src/main/java/fr/xephi/authme/converter/ForceFlatToSqlite.java b/src/main/java/fr/xephi/authme/converter/ForceFlatToSqlite.java
index b25e7110c..2c95d1cd0 100644
--- a/src/main/java/fr/xephi/authme/converter/ForceFlatToSqlite.java
+++ b/src/main/java/fr/xephi/authme/converter/ForceFlatToSqlite.java
@@ -10,11 +10,8 @@ import fr.xephi.authme.settings.Settings;
 public class ForceFlatToSqlite implements Converter {
 
     private DataSource data;
-    private AuthMe plugin;
-
     public ForceFlatToSqlite(DataSource data, AuthMe plugin) {
         this.data = data;
-        this.plugin = plugin;
     }
 
     @Override