Update /addxp to use Bukkit handling by default rather than ours.

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

@@ -7,6 +7,7 @@ import org.bukkit.command.PluginCommand;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.admin.AddlevelsCommand;
+import com.gmail.nossr50.commands.admin.AddxpCommand;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.acrobatics.AcrobaticsCommand;
 import com.gmail.nossr50.skills.archery.ArcheryCommand;
@@ -121,4 +122,13 @@ public final class CommandRegistrationHelper {
         command.setUsage(LocaleLoader.getString("Commands.Usage.3", new Object[] {"addlevels", "[" + LocaleLoader.getString("Commands.Usage.Player") + "]", "<" + LocaleLoader.getString("Commands.Usage.Skill") + ">", "<" + LocaleLoader.getString("Commands.Usage.Level") + ">" }));
         command.setExecutor(new AddlevelsCommand());
     }
+
+    public static void registerAddxpCommand() {
+        PluginCommand command = mcMMO.p.getCommand("addxp");
+        command.setDescription(LocaleLoader.getString("Commands.Description.addxp"));
+        command.setPermission("mcmmo.commands.addxp");
+        command.setPermissionMessage(permissionsMessage);
+        command.setUsage(LocaleLoader.getString("Commands.Usage.3", new Object[] {"addxp", "[" + LocaleLoader.getString("Commands.Usage.Player") + "]", "<" + LocaleLoader.getString("Commands.Usage.Skill") + ">", "<" + LocaleLoader.getString("Commands.Usage.XP") + ">" }));
+        command.setExecutor(new AddxpCommand());
+    }
 }

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

@@ -6,7 +6,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.McMMOPlayer;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -16,71 +15,60 @@ import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
 
-//TODO: Any way we can make this work for offline use?
 public class AddxpCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         Player modifiedPlayer;
         int xp;
         SkillType skill;
-        String usage = LocaleLoader.getString("Commands.Usage.3", new Object[] {"addxp", "[" + LocaleLoader.getString("Commands.Usage.Player") + "]", "<" + LocaleLoader.getString("Commands.Usage.Skill") + ">", "<" + LocaleLoader.getString("Commands.Usage.XP") + ">" });
+        McMMOPlayer mcMMOPlayer;
+        PlayerProfile profile;
 
         switch (args.length) {
         case 2:
-            if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.addxp")) {
-                return true;
+            if (!(sender instanceof Player)) {
+                return false;
             }
 
-            if (sender instanceof Player) {
             if (!SkillTools.isSkill(args[1])) {
                 sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
                 return true;
             }
 
-                if (Misc.isInt(args[1])) {
-                    modifiedPlayer = (Player) sender;
+            if (!Misc.isInt(args[1])) {
+                return false;
+            }
+
             xp = Integer.valueOf(args[1]);
             skill = SkillTools.getSkillType(args[0]);
+            modifiedPlayer = (Player) sender;
+            mcMMOPlayer = Users.getPlayer(modifiedPlayer);
+            profile = mcMMOPlayer.getProfile();
 
-                    PlayerProfile profile = Users.getProfile(modifiedPlayer);
-                    McMMOPlayer mcMMOPlayer = Users.getPlayer(modifiedPlayer);
             mcMMOPlayer.addXpOverride(skill, xp);
 
-                    if (skill.equals(SkillType.ALL)) {
-                        modifiedPlayer.sendMessage(LocaleLoader.getString("Commands.addxp.AwardAll", new Object[] {xp}));
-                    }
-                    else {
-                        modifiedPlayer.sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", new Object[] {xp, Misc.getCapitalized(skill.toString())}));
-                    }
-
             if (skill.equals(SkillType.ALL)) {
                 SkillTools.xpCheckAll(modifiedPlayer, profile);
+                sender.sendMessage(LocaleLoader.getString("Commands.addxp.AwardAll", new Object[] { xp }));
             }
             else {
                 SkillTools.xpCheckSkill(skill, modifiedPlayer, profile);
-                    }
-                }
-                else {
-                    sender.sendMessage(usage);
-                }
-            }
-            else {
-                sender.sendMessage(usage);
+                sender.sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", new Object[] { xp, Misc.getCapitalized(skill.toString()) }));
             }
 
             return true;
 
         case 3:
-            if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.addxp.others")) {
+            if (!Permissions.hasPermission(sender, "mcmmo.commands.addxp.others")) {
+                sender.sendMessage(command.getPermissionMessage());
                 return true;
             }
 
             modifiedPlayer = mcMMO.p.getServer().getPlayer(args[0]);
-            String playerName = modifiedPlayer.getName();
-            McMMOPlayer mcMMOPlayer = Users.getPlayer(modifiedPlayer);
-            PlayerProfile profile = Users.getProfile(modifiedPlayer);
+            mcMMOPlayer = Users.getPlayer(modifiedPlayer);
+            profile = mcMMOPlayer.getProfile();
 
-            // TODO: Not sure if we actually need a null check here
+          //TODO: Any way we can make this work for offline use?
             if (profile == null || !profile.isLoaded()) {
                 sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
                 return true;
@@ -91,37 +79,31 @@ public class AddxpCommand implements CommandExecutor {
                 return true;
             }
 
-            if (Misc.isInt(args[2])) {
+            if (!Misc.isInt(args[2])) {
+                return false;
+            }
+
             xp = Integer.valueOf(args[2]);
             skill = SkillTools.getSkillType(args[1]);
+            String playerName = modifiedPlayer.getName();
 
             mcMMOPlayer.addXpOverride(skill, xp);
 
             if (skill.equals(SkillType.ALL)) {
                 sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", new Object[] { playerName }));
-                }
-                else {
-                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", new Object[] {Misc.getCapitalized(skill.toString()), playerName}));
-                }
-
-                if (skill.equals(SkillType.ALL)) {
                 modifiedPlayer.sendMessage(LocaleLoader.getString("Commands.addxp.AwardAll", new Object[] { xp }));
                 SkillTools.xpCheckAll(modifiedPlayer, profile);
             }
             else {
+                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", new Object[] { Misc.getCapitalized(skill.toString()), playerName }));
                 modifiedPlayer.sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", new Object[] { xp, Misc.getCapitalized(skill.toString()) }));
                 SkillTools.xpCheckSkill(skill, modifiedPlayer, profile);
             }
-            }
-            else {
-                sender.sendMessage(usage);
-            }
 
             return true;
 
         default:
-            sender.sendMessage(usage);
-            return true;
+            return false;
         }
     }
 }

src/main/resources/locale/locale_en_US.properties

@@ -687,4 +687,5 @@ Smelting.SkillName=SMELTING
 
 #COMMAND DESCRIPTIONS
 Commands.Description.addlevels=Add mcMMO levels to a user
+Commands.Description.addxp=Add mcMMO XP to a user
 Commands.Description.Skill=Detailed mcMMO skill info for {0}

src/main/resources/plugin.yml

@@ -43,7 +43,7 @@ commands:
         description: Show your individual ranking in mcMMO
     addxp:
         aliases: []
-        description: Add XP to a user
+        description: Add mcMMO XP to a user
     addlevels:
         description: Add mcMMO levels to a user
     mcability: