Stuff! + HikariCP Log4J

src/main/java/fr/xephi/authme/DataManager.java

@@ -134,10 +134,13 @@ public class DataManager {
                     playerFile.delete();
                     i++;
                 } else {
-                    playerFile = new File(plugin.ess.getDataFolder() + File.separator + "userdata" + File.separator + Bukkit.getOfflinePlayer(name).getUniqueId() + ".yml");
-                    if (playerFile.exists()) {
-                        playerFile.delete();
-                        i++;
+                    try {
+                        playerFile = new File(plugin.ess.getDataFolder() + File.separator + "userdata" + File.separator + Bukkit.getOfflinePlayer(name).getUniqueId() + ".yml");
+                        if (playerFile.exists()) {
+                            playerFile.delete();
+                            i++;
+                        }
+                    } catch (Exception e) { // Don't do nothing if the method getUniqueId() isn't avariable ( MC version < 1.7.5 )
                     }
                 }
             } catch (Exception e) {

src/main/java/fr/xephi/authme/settings/Messages.java

@@ -1,12 +1,9 @@
 package fr.xephi.authme.settings;
 
 import java.io.File;
-import java.io.InputStream;
-
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.YamlConfiguration;
 
-import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 
 public class Messages extends CustomConfiguration {
@@ -29,13 +26,11 @@ public class Messages extends CustomConfiguration {
      * @param filename
      *            The filename to open
      */
-    @SuppressWarnings("deprecation")
     public final void loadDefaults(File file) {
-        InputStream stream = AuthMe.getInstance().getResource(file.getName());
-        if (stream == null)
-            return;
-
-        setDefaults(YamlConfiguration.loadConfiguration(stream));
+        if(file.isFile()){
+            setDefaults(YamlConfiguration.loadConfiguration(file));
+        }
+        return;
     }
 
     /**

src/main/java/fr/xephi/authme/settings/Settings.java

@@ -28,7 +28,7 @@ public final class Settings extends YamlConfiguration {
     public static String PLUGIN_FOLDER = "." + File.separator + "plugins" + File.separator + "AuthMe";
     public static final String CACHE_FOLDER = Settings.PLUGIN_FOLDER + File.separator + "cache";
     public static final String AUTH_FILE = Settings.PLUGIN_FOLDER + File.separator + "auths.db";
-    public static final String MESSAGE_FILE = Settings.PLUGIN_FOLDER + File.separator + "messages";
+    public static final String MESSAGE_FILE = Settings.PLUGIN_FOLDER + File.separator + "messages" + File.separator + "messages";
     public static final String SETTINGS_FILE = Settings.PLUGIN_FOLDER + File.separator + "config.yml";
     public static List<String> allowCommands = null;
     public static List<String> getJoinPermissions = null;