Ver código fonte

Don't allow these commands on child skills.

t00thpick1 7 anos atrás
pai
commit
29c55312a5

+ 12 - 0
src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java

@@ -46,6 +46,12 @@ public abstract class ExperienceCommand implements TabExecutor {
                     skill = null;
                     skill = null;
                 }
                 }
 
 
+                if (skill != null && skill.isChildSkill())
+                {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.ChildSkill"));
+                    return true;
+                }
+
                 editValues((Player) sender, UserManager.getPlayer(sender.getName()).getProfile(), skill, Integer.parseInt(args[1]));
                 editValues((Player) sender, UserManager.getPlayer(sender.getName()).getProfile(), skill, Integer.parseInt(args[1]));
                 return true;
                 return true;
 
 
@@ -65,6 +71,12 @@ public abstract class ExperienceCommand implements TabExecutor {
                     skill = null;
                     skill = null;
                 }
                 }
 
 
+                if (skill != null && skill.isChildSkill())
+                {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.ChildSkill"));
+                    return true;
+                }
+
                 int value = Integer.parseInt(args[2]);
                 int value = Integer.parseInt(args[2]);
 
 
                 String playerName = CommandUtils.getMatchedPlayerName(args[0]);
                 String playerName = CommandUtils.getMatchedPlayerName(args[0]);

+ 1 - 0
src/main/resources/locale/locale_en_US.properties

@@ -569,6 +569,7 @@ Commands.Scoreboard.Help.3=[[DARK_AQUA]]/mcscoreboard[[AQUA]] time [n] [[WHITE]]
 Commands.Scoreboard.Tip.Keep=[[GOLD]]Tip: Use [[RED]]/mcscoreboard keep[[GOLD]] while the scoreboard is shown to keep it from going away.
 Commands.Scoreboard.Tip.Keep=[[GOLD]]Tip: Use [[RED]]/mcscoreboard keep[[GOLD]] while the scoreboard is shown to keep it from going away.
 Commands.Scoreboard.Tip.Clear=[[GOLD]]Tip: Use [[RED]]/mcscoreboard clear[[GOLD]] to get rid of the scoreboard.
 Commands.Scoreboard.Tip.Clear=[[GOLD]]Tip: Use [[RED]]/mcscoreboard clear[[GOLD]] to get rid of the scoreboard.
 Commands.Skill.Invalid=[[RED]]That is not a valid skillname!
 Commands.Skill.Invalid=[[RED]]That is not a valid skillname!
+Commands.Skill.ChildSkill=[[RED]]Child skills are not valid for this command!
 Commands.Skill.Leaderboard=[[YELLOW]]--mcMMO [[BLUE]]{0}[[YELLOW]] Leaderboard--
 Commands.Skill.Leaderboard=[[YELLOW]]--mcMMO [[BLUE]]{0}[[YELLOW]] Leaderboard--
 Commands.SkillInfo=[[GREEN]]- View detailed information about a skill
 Commands.SkillInfo=[[GREEN]]- View detailed information about a skill
 Commands.Stats.Self=YOUR STATS
 Commands.Stats.Self=YOUR STATS