mcMMO now checks in all places for a loaded profile before executing processing on said profile

src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java

@@ -18,6 +18,10 @@ public class McnotifyCommand implements TabExecutor {
             case 0:
                 McMMOPlayer mcMMOPlayer = UserManager.getPlayer((Player) sender);
 
+                //Not Loaded yet
+                if(mcMMOPlayer == null)
+                    sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+
                 sender.sendMessage(LocaleLoader.getString("Commands.Notifications." + (mcMMOPlayer.useChatNotifications() ? "Off" : "On")));
                 mcMMOPlayer.toggleChatNotifications();
                 return true;

src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java

@@ -22,6 +22,10 @@ public class PartyChatCommand extends ChatCommand {
         String message;
 
         if (sender instanceof Player) {
+            //Check if player profile is loaded
+            if(UserManager.getPlayer((Player) sender) == null)
+                return;
+
             party = UserManager.getPlayer((Player) sender).getParty();
 
             if (party == null) {

src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java

@@ -24,6 +24,10 @@ public class AddxpCommand extends ExperienceCommand {
     @Override
     protected void handleCommand(Player player, PlayerProfile profile, PrimarySkillType skill, int value) {
         if (player != null) {
+            //Check if player profile is loaded
+            if(UserManager.getPlayer(player) == null)
+                return;
+
             UserManager.getPlayer(player).applyXpGain(skill, value, XPGainReason.COMMAND, XPGainSource.COMMAND);
         }
         else {

src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java

@@ -51,6 +51,14 @@ public abstract class ExperienceCommand implements TabExecutor {
                     return true;
                 }
 
+                //Profile not loaded
+                if(UserManager.getPlayer(sender.getName()) == null)
+                {
+                    sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+                    return true;
+                }
+
+
                 editValues((Player) sender, UserManager.getPlayer(sender.getName()).getProfile(), skill, Integer.parseInt(args[1]));
                 return true;
 

src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java

@@ -15,8 +15,17 @@ public class PartyAcceptCommand implements CommandExecutor {
         switch (args.length) {
             case 1:
                 Player player = (Player) sender;
+
+                //Check if player profile is loaded
+                if(UserManager.getPlayer(player) == null)
+                {
+                    sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+                    return true;
+                }
+
                 McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
+
                 if (!mcMMOPlayer.hasPartyInvite()) {
                     sender.sendMessage(LocaleLoader.getString("mcMMO.NoInvites"));
                     return true;

src/main/java/com/gmail/nossr50/commands/party/PartyChangeOwnerCommand.java

@@ -17,6 +17,13 @@ public class PartyChangeOwnerCommand implements CommandExecutor {
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
             case 2:
+                //Check if player profile is loaded
+                if(UserManager.getPlayer((Player) sender) == null)
+                {
+                    sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+                    return true;
+                }
+
                 Party playerParty = UserManager.getPlayer((Player) sender).getParty();
                 String targetName = CommandUtils.getMatchedPlayerName(args[1]);
                 OfflinePlayer target = mcMMO.p.getServer().getOfflinePlayer(targetName);

src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java

@@ -11,6 +11,12 @@ import org.bukkit.entity.Player;
 public class PartyChangePasswordCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if(UserManager.getPlayer((Player) sender) == null)
+        {
+            sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+            return true;
+        }
+
         Party party = UserManager.getPlayer((Player) sender).getParty();
 
         switch (args.length) {

src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java

@@ -74,6 +74,12 @@ public class PartyCommand implements TabExecutor {
             return true;
         }
 
+        if(UserManager.getPlayer(player) == null)
+        {
+            player.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+            return true;
+        }
+
         McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
         if (args.length < 1) {
@@ -197,6 +203,14 @@ public class PartyCommand implements TabExecutor {
 
                         if (matches.size() == 0) {
                             Player player = (Player) sender;
+
+                            //Not Loaded
+                            if(UserManager.getPlayer(player) == null)
+                            {
+                                sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+                                return ImmutableList.of();
+                            }
+
                             Party party = UserManager.getPlayer(player).getParty();
 
                             playerNames = party.getOnlinePlayerNames(player);

src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java

@@ -18,6 +18,12 @@ public class PartyCreateCommand implements CommandExecutor {
                 Player player = (Player) sender;
                 McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
+                if(UserManager.getPlayer(player) == null)
+                {
+                    player.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+                    return true;
+                }
+
                 // Check to see if the party exists, and if it does cancel creating a new party
                 if (PartyManager.checkPartyExistence(player, args[1])) {
                     return true;

src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.java

@@ -15,6 +15,12 @@ public class PartyDisbandCommand implements CommandExecutor {
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
             case 1:
+                if(UserManager.getPlayer((Player) sender) == null)
+                {
+                    sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+                    return true;
+                }
+
                 Party playerParty = UserManager.getPlayer((Player) sender).getParty();
                 String partyName = playerParty.getName();
 

src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java

@@ -23,6 +23,11 @@ public class PartyInfoCommand implements CommandExecutor {
         switch (args.length) {
             case 0:
             case 1:
+                if(UserManager.getPlayer((Player) sender) == null)
+                {
+                    sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+                    return true;
+                }
                 Player player = (Player) sender;
                 McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
                 Party party = mcMMOPlayer.getParty();

src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java

@@ -25,6 +25,13 @@ public class PartyInviteCommand implements CommandExecutor {
                 }
 
                 Player target = mcMMOTarget.getPlayer();
+
+                if(UserManager.getPlayer((Player) sender) == null)
+                {
+                    sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+                    return true;
+                }
+
                 Player player = (Player) sender;
                 McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
                 String playerName = player.getName();

src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java

@@ -17,6 +17,12 @@ import org.bukkit.entity.Player;
 public class PartyItemShareCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if(UserManager.getPlayer((Player) sender) == null)
+        {
+            sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+            return true;
+        }
+
         Party party = UserManager.getPlayer((Player) sender).getParty();
 
         if (party.getLevel() < Config.getInstance().getPartyFeatureUnlockLevel(PartyFeature.ITEM_SHARE)) {

src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java

@@ -32,6 +32,13 @@ public class PartyJoinCommand implements CommandExecutor {
                 }
 
                 Player player = (Player) sender;
+
+                if(UserManager.getPlayer((Player) sender) == null)
+                {
+                    sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+                    return true;
+                }
+
                 McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
                 Party targetParty = mcMMOTarget.getParty();
 

src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java

@@ -18,6 +18,12 @@ public class PartyKickCommand implements CommandExecutor {
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
             case 2:
+                if(UserManager.getPlayer((Player) sender) == null)
+                {
+                    sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+                    return true;
+                }
+
                 Party playerParty = UserManager.getPlayer((Player) sender).getParty();
                 String targetName = CommandUtils.getMatchedPlayerName(args[1]);
 

src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java

@@ -54,6 +54,12 @@ public class PartyLockCommand implements CommandExecutor {
     }
 
     private void togglePartyLock(CommandSender sender, boolean lock) {
+        if(UserManager.getPlayer((Player) sender) == null)
+        {
+            sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+            return;
+        }
+
         Party party = UserManager.getPlayer((Player) sender).getParty();
 
         if (!Permissions.partySubcommand(sender, lock ? PartySubcommandType.LOCK : PartySubcommandType.UNLOCK)) {

src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java

@@ -17,6 +17,13 @@ public class PartyQuitCommand implements CommandExecutor {
         switch (args.length) {
             case 1:
                 Player player = (Player) sender;
+
+                if(UserManager.getPlayer((Player) sender) == null)
+                {
+                    sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+                    return true;
+                }
+
                 McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
                 Party playerParty = mcMMOPlayer.getParty();
 

src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java

@@ -16,6 +16,12 @@ public class PartyRenameCommand implements CommandExecutor {
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
             case 2:
+                if(UserManager.getPlayer((Player) sender) == null)
+                {
+                    sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+                    return true;
+                }
+
                 McMMOPlayer mcMMOPlayer = UserManager.getPlayer((Player) sender);
                 Party playerParty = mcMMOPlayer.getParty();
 

src/main/java/com/gmail/nossr50/commands/party/PartyXpShareCommand.java

@@ -16,6 +16,12 @@ import org.bukkit.entity.Player;
 public class PartyXpShareCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if(UserManager.getPlayer((Player) sender) == null)
+        {
+            sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+            return true;
+        }
+
         Party party = UserManager.getPlayer((Player) sender).getParty();
 
         if (party.getLevel() < Config.getInstance().getPartyFeatureUnlockLevel(PartyFeature.XP_SHARE)) {

src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceAcceptCommand.java

@@ -14,6 +14,11 @@ public class PartyAllianceAcceptCommand implements CommandExecutor {
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
             case 2:
+                if(UserManager.getPlayer((Player) sender) == null)
+                {
+                    sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+                    return true;
+                }
                 Player player = (Player) sender;
                 McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 

src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java

@@ -37,6 +37,12 @@ public class PartyAllianceCommand implements TabExecutor {
             return true;
         }
 
+        if(UserManager.getPlayer((Player) sender) == null)
+        {
+            sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+            return true;
+        }
+
         player = (Player) sender;
         McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 

src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceDisbandCommand.java

@@ -15,6 +15,11 @@ public class PartyAllianceDisbandCommand implements CommandExecutor {
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
             case 2:
+                if(UserManager.getPlayer((Player) sender) == null)
+                {
+                    sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+                    return true;
+                }
                 Player player = (Player) sender;
                 McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
                 Party party = mcMMOPlayer.getParty();

src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceInviteCommand.java

@@ -24,6 +24,13 @@ public class PartyAllianceInviteCommand implements CommandExecutor {
                 }
 
                 Player target = mcMMOTarget.getPlayer();
+
+                if(UserManager.getPlayer((Player) sender) == null)
+                {
+                    sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+                    return true;
+                }
+
                 Player player = (Player) sender;
                 McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
                 String playerName = player.getName();

src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java

@@ -20,6 +20,12 @@ public class PtpAcceptCommand implements CommandExecutor {
             return true;
         }
 
+        if(UserManager.getPlayer((Player) sender) == null)
+        {
+            sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+            return true;
+        }
+
         Player player = (Player) sender;
         PartyTeleportRecord ptpRecord = UserManager.getPlayer(player).getPartyTeleportRecord();
 

src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java

@@ -59,6 +59,12 @@ public class PtpCommand implements TabExecutor {
             return true;
         }
 
+        if(UserManager.getPlayer((Player) sender) == null)
+        {
+            sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+            return true;
+        }
+
         McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
         if (!mcMMOPlayer.inParty()) {
@@ -131,6 +137,12 @@ public class PtpCommand implements TabExecutor {
                 List<String> matches = StringUtil.copyPartialMatches(args[0], TELEPORT_SUBCOMMANDS, new ArrayList<String>(TELEPORT_SUBCOMMANDS.size()));
 
                 if (matches.size() == 0) {
+                    if(UserManager.getPlayer((Player) sender) == null)
+                    {
+                        sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+                        return ImmutableList.of();
+                    }
+
                     Player player = (Player) sender;
                     McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
@@ -205,6 +217,18 @@ public class PtpCommand implements TabExecutor {
     }
 
     protected static void handleTeleportWarmup(Player teleportingPlayer, Player targetPlayer) {
+        if(UserManager.getPlayer(targetPlayer) == null)
+        {
+            targetPlayer.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+            return;
+        }
+
+        if(UserManager.getPlayer(teleportingPlayer) == null)
+        {
+            teleportingPlayer.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+            return;
+        }
+
         McMMOPlayer mcMMOPlayer = UserManager.getPlayer(teleportingPlayer);
         McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetPlayer);
 

src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java

@@ -38,6 +38,12 @@ public class MccooldownCommand implements TabExecutor {
                     }
                 }
 
+                if(UserManager.getPlayer(player) == null)
+                {
+                    player.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+                    return true;
+                }
+
                 McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
                 player.sendMessage(LocaleLoader.getString("Commands.Cooldowns.Header"));

src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java

@@ -88,6 +88,13 @@ public class McrankCommand implements TabExecutor {
     private void display(CommandSender sender, String playerName) {
         if (sender instanceof Player) {
             McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
+
+            if(mcMMOPlayer == null)
+            {
+                sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+                return;
+            }
+
             long cooldownMillis = Math.max(Config.getInstance().getDatabasePlayerCooldown(), 1750);
 
             if (mcMMOPlayer.getDatabaseATS() + cooldownMillis > System.currentTimeMillis()) {

src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java

@@ -26,6 +26,12 @@ public class McstatsCommand implements TabExecutor {
 
         switch (args.length) {
             case 0:
+                if(UserManager.getPlayer((Player) sender) == null)
+                {
+                    sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+                    return true;
+                }
+
                 Player player = (Player) sender;
 
                 if (Config.getInstance().getStatsUseBoard() && Config.getInstance().getScoreboardsEnabled()) {

src/main/java/com/gmail/nossr50/commands/skills/AlchemyCommand.java

@@ -30,6 +30,13 @@ public class AlchemyCommand extends SkillCommand {
     }
 
     protected String[] calculateAbilityDisplayValues(Player player) {
+        //TODO: Needed?
+        if(UserManager.getPlayer(player) == null)
+        {
+            player.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+            return new String[] {"DATA NOT LOADED", "DATA NOT LOADED"};
+        }
+
         AlchemyManager alchemyManager = UserManager.getPlayer(player).getAlchemyManager();
         String[] displayValues = new String[2];
 

src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java

@@ -56,6 +56,12 @@ public abstract class SkillCommand implements TabExecutor {
             return true;
         }
 
+        if(UserManager.getPlayer((Player) sender) == null)
+        {
+            sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+            return true;
+        }
+
         switch (args.length) {
             case 0:
                 Player player = (Player) sender;