Fixed bug where trying to use /mctop or /xplock with the Smelting child

skill caused NPEs. Fixes #748
mcMMO-Dev · Mar 1, 2013 · a87336b · a87336b
1 parent 7814fa8
commit a87336b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -8,6 +8,7 @@ Key:
   - Removal
 
 Version 1.4.01-dev
+ = Fixed bug where trying to use /mctop or /xplock with the Smelting child skill caused NPEs
 
 Version 1.4.00
  + Added new Child Skill - Smelting!

diff --git a/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java b/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java
@@ -31,7 +31,14 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
                     display(Integer.parseInt(args[0]), "ALL", sender, useMySQL, command);
                 }
                 else if (SkillUtils.isSkill(args[0])) {
-                    display(1, SkillType.getSkill(args[0]).toString(), sender, useMySQL, command);
+                    SkillType skill = SkillType.getSkill(args[0]);
+
+                    if (skill.isChildSkill()) {
+                        sender.sendMessage("Child skills are not yet supported by this command."); // TODO: Localize this
+                        return true;
+                    }
+
+                    display(1, skill.toString(), sender, useMySQL, command);
                 }
                 else {
                     sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
@@ -45,7 +52,14 @@ else if (SkillUtils.isSkill(args[0])) {
                 }
 
                 if (SkillUtils.isSkill(args[0])) {
-                    display(Integer.parseInt(args[1]), SkillType.getSkill(args[0]).toString(), sender, useMySQL, command);
+                    SkillType skill = SkillType.getSkill(args[0]);
+
+                    if (skill.isChildSkill()) {
+                        sender.sendMessage("Child skills are not yet supported by this command."); // TODO: Localize this
+                        return true;
+                    }
+
+                    display(Integer.parseInt(args[1]), skill.toString(), sender, useMySQL, command);
                 }
                 else {
                     sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));

diff --git a/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java b/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java
@@ -39,6 +39,11 @@ protected boolean oneArgument(Command command, CommandSender sender, String[] ar
 
         SkillType skill = SkillType.getSkill(args[0]);
 
+        if (skill.isChildSkill()) {
+            sender.sendMessage("Child skills are not yet supported by this command."); // TODO: Localize this
+            return true;
+        }
+
         if (!Permissions.xplock(sender, skill)) {
             sender.sendMessage(command.getPermissionMessage());
             return true;