diff --git a/src/main/java/com/gmail/nossr50/commands/CommandHelper.java b/src/main/java/com/gmail/nossr50/commands/CommandHelper.java index 46516d8b8..1e038f104 100644 --- a/src/main/java/com/gmail/nossr50/commands/CommandHelper.java +++ b/src/main/java/com/gmail/nossr50/commands/CommandHelper.java @@ -51,6 +51,11 @@ public class CommandHelper { if (Skills.hasGatheringSkills(inspect)) { PlayerProfile profile = Users.getProfile(inspect); + if (profile == null) { + display.sendMessage(LocaleLoader.getString("Commands.DoesNotExist")); + return; + } + display.sendMessage(LocaleLoader.getString("Stats.Header.Gathering")); if (Permissions.getInstance().excavation(inspect)) { @@ -89,6 +94,11 @@ public class CommandHelper { if (Skills.hasCombatSkills(inspect)) { PlayerProfile profile = Users.getProfile(inspect); + if (profile == null) { + display.sendMessage(LocaleLoader.getString("Commands.DoesNotExist")); + return; + } + display.sendMessage(LocaleLoader.getString("Stats.Header.Combat")); if (Permissions.getInstance().axes(inspect)) { @@ -126,6 +136,12 @@ public class CommandHelper { public static void printMiscSkills(Player inspect, CommandSender display) { if (Skills.hasMiscSkills(inspect)) { PlayerProfile profile = Users.getProfile(inspect); + + if (profile == null) { + display.sendMessage(LocaleLoader.getString("Commands.DoesNotExist")); + return; + } + display.sendMessage(LocaleLoader.getString("Stats.Header.Misc")); if (Permissions.getInstance().acrobatics(inspect)) { diff --git a/src/main/java/com/gmail/nossr50/commands/SkillCommand.java b/src/main/java/com/gmail/nossr50/commands/SkillCommand.java index b25edb77e..e56911820 100644 --- a/src/main/java/com/gmail/nossr50/commands/SkillCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/SkillCommand.java @@ -46,6 +46,11 @@ public abstract class SkillCommand implements CommandExecutor { player = (Player) sender; profile = Users.getProfile(player); + if (profile == null) { + sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist")); + return true; + } + skillValue = profile.getSkillLevel(skill); dataCalculations(); permissionsCheck(); diff --git a/src/main/java/com/gmail/nossr50/commands/general/AddlevelsCommand.java b/src/main/java/com/gmail/nossr50/commands/general/AddlevelsCommand.java index 6443b35a1..9b96d5c73 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/AddlevelsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/AddlevelsCommand.java @@ -72,6 +72,11 @@ public class AddlevelsCommand implements CommandExecutor{ String playerName = modifiedPlayer.getName(); profile = Users.getProfile(modifiedPlayer); + if (profile == null) { + sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist")); + return true; + } + if (!profile.isLoaded()) { sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist")); return true; diff --git a/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java b/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java index d476a3dee..e8ca5b33e 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.java @@ -84,6 +84,11 @@ public class AddxpCommand implements CommandExecutor { String playerName = modifiedPlayer.getName(); McMMOPlayer mcMMOPlayer = Users.getPlayer(modifiedPlayer); PlayerProfile profile = Users.getProfile(modifiedPlayer); + + if (profile == null) { + sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist")); + return true; + } if (!profile.isLoaded()) { sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist")); diff --git a/src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java b/src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java index 5404ae1ef..98518af14 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java @@ -51,6 +51,11 @@ public class InspectCommand implements CommandExecutor { PlayerProfile profile = new PlayerProfile(args[0], false); //Temporary Profile + if (profile == null) { + sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist")); + return true; + } + if (!profile.isLoaded()) { sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist")); return true; diff --git a/src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java b/src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java index d4b347ad1..bb276e5af 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.java @@ -88,6 +88,11 @@ public class MmoeditCommand implements CommandExecutor { if (mcmmoPlayer != null) { profile = mcmmoPlayer.getProfile(); + if (profile == null) { + sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist")); + return true; + } + profile.modifySkill(skill, newValue); mcmmoPlayer.getPlayer().sendMessage(ChatColor.GREEN + "Your level in " + skillName + " was set to " + newValue + "!"); //TODO: Needs more locale. sender.sendMessage(ChatColor.RED + skillName + " has been modified for " + args[0] + "."); //TODO: Use locale @@ -95,6 +100,11 @@ public class MmoeditCommand implements CommandExecutor { else { profile = new PlayerProfile(args[0], false); //Temporary Profile + if (profile == null) { + sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist")); + return true; + } + if (!profile.isLoaded()) { sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist")); return true; diff --git a/src/main/java/com/gmail/nossr50/commands/general/SkillResetCommand.java b/src/main/java/com/gmail/nossr50/commands/general/SkillResetCommand.java index 63de48751..48404f88d 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/SkillResetCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/SkillResetCommand.java @@ -45,6 +45,12 @@ public class SkillResetCommand implements CommandExecutor { //reset the values in the hash table and persist them PlayerProfile profile = Users.getProfile((Player)sender); + + if (profile == null) { + sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist")); + return true; + } + profile.resetSkill(skillType); profile.save(); diff --git a/src/main/java/com/gmail/nossr50/commands/mc/McabilityCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/McabilityCommand.java index b91e32abe..98a698a87 100644 --- a/src/main/java/com/gmail/nossr50/commands/mc/McabilityCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/mc/McabilityCommand.java @@ -24,6 +24,11 @@ public class McabilityCommand implements CommandExecutor { PlayerProfile profile = Users.getProfile((Player) sender); + if (profile == null) { + sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist")); + return true; + } + if (profile.getAbilityUse()) { sender.sendMessage(LocaleLoader.getString("Commands.Ability.Off")); } diff --git a/src/main/java/com/gmail/nossr50/commands/mc/McgodCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/McgodCommand.java index 572414499..ebbed2213 100644 --- a/src/main/java/com/gmail/nossr50/commands/mc/McgodCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/mc/McgodCommand.java @@ -24,6 +24,11 @@ public class McgodCommand implements CommandExecutor { PlayerProfile profile = Users.getProfile((Player) sender); + if (profile == null) { + sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist")); + return true; + } + if (profile.getGodMode()) { sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Disabled")); } diff --git a/src/main/java/com/gmail/nossr50/commands/mc/McrefreshCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/McrefreshCommand.java index efc9ce4f3..302007261 100644 --- a/src/main/java/com/gmail/nossr50/commands/mc/McrefreshCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/mc/McrefreshCommand.java @@ -47,6 +47,11 @@ public class McrefreshCommand implements CommandExecutor { profile = Users.getProfile(player); String playerName = player.getName(); + if (profile == null) { + sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist")); + return true; + } + if (!profile.isLoaded()) { sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist")); return true;