From 29c55312a566b6dfc9d35c5e3837f215babe1caf Mon Sep 17 00:00:00 2001 From: t00thpick1 Date: Tue, 1 May 2018 23:11:53 -0400 Subject: [PATCH] Don't allow these commands on child skills. --- .../commands/experience/ExperienceCommand.java | 12 ++++++++++++ src/main/resources/locale/locale_en_US.properties | 1 + 2 files changed, 13 insertions(+) diff --git a/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java b/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java index 5ad0bf5d1..bf0e0c37a 100644 --- a/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java @@ -46,6 +46,12 @@ public abstract class ExperienceCommand implements TabExecutor { 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])); return true; @@ -65,6 +71,12 @@ public abstract class ExperienceCommand implements TabExecutor { skill = null; } + if (skill != null && skill.isChildSkill()) + { + sender.sendMessage(LocaleLoader.getString("Commands.Skill.ChildSkill")); + return true; + } + int value = Integer.parseInt(args[2]); String playerName = CommandUtils.getMatchedPlayerName(args[0]); diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties index 153bd509b..cd50af3c1 100644 --- a/src/main/resources/locale/locale_en_US.properties +++ b/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.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.ChildSkill=[[RED]]Child skills are not valid for this command! Commands.Skill.Leaderboard=[[YELLOW]]--mcMMO [[BLUE]]{0}[[YELLOW]] Leaderboard-- Commands.SkillInfo=[[GREEN]]- View detailed information about a skill Commands.Stats.Self=YOUR STATS