Merge branch 'configurable' into api

mcmmo-core/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java

@@ -223,10 +223,10 @@ public abstract class SkillCommand implements TabExecutor {
         String statDescriptionKey = !isExtra ? subSkillType.getLocaleKeyStatDescription(pluginRef) : subSkillType.getLocaleKeyStatExtraDescription(pluginRef);
 
         if (isCustom)
-            return pluginRef.getLocaleManager().getString(templateKey, pluginRef.getLocaleManager().getString(statDescriptionKey, vars));
+            return pluginRef.getLocaleManager().getString(templateKey, pluginRef.getLocaleManager().getString(statDescriptionKey, (Object[]) vars));
         else {
             String[] mergedList = pluginRef.getNotificationManager().addItemToFirstPositionOfArray(pluginRef.getLocaleManager().getString(statDescriptionKey), vars);
-            return pluginRef.getLocaleManager().getString(templateKey, mergedList);
+            return pluginRef.getLocaleManager().getString(templateKey, (Object[]) mergedList);
         }
     }
 

mcmmo-core/src/main/java/com/gmail/nossr50/database/FlatFileDatabaseManager.java

@@ -530,11 +530,6 @@ public final class FlatFileDatabaseManager implements DatabaseManager {
 
                 // Didn't find the player, create a new one
                 if (create) {
-                    if (uuid == null) {
-                        newUser(playerName, uuid);
-                        return new PlayerProfile(pluginRef, playerName, true);
-                    }
-
                     newUser(playerName, uuid);
                     return new PlayerProfile(pluginRef, playerName, uuid, true);
                 }
@@ -554,10 +549,6 @@ public final class FlatFileDatabaseManager implements DatabaseManager {
         }
 
         // Return unloaded profile
-        if (uuid == null) {
-            return new PlayerProfile(pluginRef, playerName);
-        }
-
         return new PlayerProfile(pluginRef, playerName, uuid);
     }
 

mcmmo-core/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java

@@ -564,10 +564,10 @@ public final class SQLDatabaseManager implements DatabaseManager {
                     id = newUser(connection, playerName, uuid);
                     create = false;
                     if (id == -1) {
-                        return new PlayerProfile(pluginRef, playerName, false);
+                        return new PlayerProfile(pluginRef, playerName, uuid, false);
                     }
                 } else {
-                    return new PlayerProfile(pluginRef, playerName, false);
+                    return new PlayerProfile(pluginRef, playerName, uuid,false);
                 }
             }
             // There is such a user
@@ -634,7 +634,7 @@ public final class SQLDatabaseManager implements DatabaseManager {
 
         // return unloaded profile
         if (!retry) {
-            return new PlayerProfile(pluginRef, playerName, false);
+            return new PlayerProfile(pluginRef, playerName, uuid, false);
         }
 
         // Retry, and abort on re-failure

mcmmo-core/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java

@@ -34,11 +34,6 @@ public class PlayerProfile {
     private HashMap<PrimarySkillType, Double> rollingSkillsXp = new HashMap<PrimarySkillType, Double>();
     private final mcMMO pluginRef;
 
-    @Deprecated
-    public PlayerProfile(mcMMO pluginRef, String playerName) {
-        this(pluginRef, playerName, null);
-    }
-
     public PlayerProfile(mcMMO pluginRef, String playerName, UUID uuid) {
         this.pluginRef = pluginRef;
         this.uuid = uuid;
@@ -60,12 +55,6 @@ public class PlayerProfile {
         uniquePlayerData.put(UniqueDataType.CHIMAERA_WING_DATS, 0); //Chimaera wing
     }
 
-    @Deprecated
-    public PlayerProfile(mcMMO pluginRef, String playerName, boolean isLoaded) {
-        this(pluginRef, playerName);
-        this.loaded = isLoaded;
-    }
-
     public PlayerProfile(mcMMO pluginRef, String playerName, UUID uuid, boolean isLoaded) {
         this(pluginRef, playerName, uuid);
         this.loaded = isLoaded;

mcmmo-core/src/main/java/com/gmail/nossr50/util/commands/CommandTools.java

@@ -75,7 +75,7 @@ public final class CommandTools {
             return true;
         }
 
-        PlayerProfile profile = new PlayerProfile(pluginRef, playerName, false);
+        PlayerProfile profile = new PlayerProfile(pluginRef, playerName, null, false);
 
         if (unloadedProfile(sender, profile)) {
             return false;

mcmmo-core/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java

@@ -214,12 +214,12 @@ public class NotificationManager {
         //Send the notification
         switch (sensitiveCommandType) {
             case XPRATE_MODIFY:
-                sendAdminNotification(pluginRef.getLocaleManager().getString("Notifications.Admin.XPRate.Start.Others", addItemToFirstPositionOfArray(senderName, args)));
-                sendAdminCommandConfirmation(commandSender, pluginRef.getLocaleManager().getString("Notifications.Admin.XPRate.Start.Self", args));
+                sendAdminNotification(pluginRef.getLocaleManager().getString("Notifications.Admin.XPRate.Start.Others", (Object[]) addItemToFirstPositionOfArray(senderName, args)));
+                sendAdminCommandConfirmation(commandSender, pluginRef.getLocaleManager().getString("Notifications.Admin.XPRate.Start.Self", (Object[]) args));
                 break;
             case XPRATE_END:
-                sendAdminNotification(pluginRef.getLocaleManager().getString("Notifications.Admin.XPRate.End.Others", addItemToFirstPositionOfArray(senderName, args)));
-                sendAdminCommandConfirmation(commandSender, pluginRef.getLocaleManager().getString("Notifications.Admin.XPRate.End.Self", args));
+                sendAdminNotification(pluginRef.getLocaleManager().getString("Notifications.Admin.XPRate.End.Others", (Object[]) addItemToFirstPositionOfArray(senderName, args)));
+                sendAdminCommandConfirmation(commandSender, pluginRef.getLocaleManager().getString("Notifications.Admin.XPRate.End.Self", (Object[]) args));
                 break;
         }
     }