|
@@ -23,32 +23,33 @@ public class AddlevelsCommand implements CommandExecutor{
|
|
|
|
|
|
switch (args.length) {
|
|
switch (args.length) {
|
|
case 2:
|
|
case 2:
|
|
- if (sender instanceof Player) {
|
|
|
|
- if (!SkillTools.isSkill(args[0])) {
|
|
|
|
- sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
|
|
|
|
- return true;
|
|
|
|
- }
|
|
|
|
|
|
+ if (!(sender instanceof Player)) {
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
|
|
- if (Misc.isInt(args[1])) {
|
|
|
|
- levels = Integer.valueOf(args[1]);
|
|
|
|
- skill = SkillTools.getSkillType(args[0]);
|
|
|
|
- profile = Users.getPlayer((Player) sender).getProfile();
|
|
|
|
|
|
+ if (!SkillTools.isSkill(args[0])) {
|
|
|
|
+ sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
|
|
|
|
+ return true;
|
|
|
|
+ }
|
|
|
|
|
|
- if (skill.equals(SkillType.ALL)) {
|
|
|
|
- sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", new Object[] {levels}));
|
|
|
|
- }
|
|
|
|
- else {
|
|
|
|
- sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", new Object[] {levels, Misc.getCapitalized(skill.toString())}));
|
|
|
|
- }
|
|
|
|
|
|
+ if (!Misc.isInt(args[1])) {
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
|
|
- profile.addLevels(skill, levels);
|
|
|
|
- return true;
|
|
|
|
- }
|
|
|
|
|
|
+ levels = Integer.valueOf(args[1]);
|
|
|
|
+ skill = SkillTools.getSkillType(args[0]);
|
|
|
|
+ profile = Users.getPlayer((Player) sender).getProfile();
|
|
|
|
+
|
|
|
|
+ if (skill.equals(SkillType.ALL)) {
|
|
|
|
+ sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", new Object[] {levels}));
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
- return false;
|
|
|
|
|
|
+ sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", new Object[] {levels, Misc.getCapitalized(skill.toString())}));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ profile.addLevels(skill, levels);
|
|
|
|
+ return true;
|
|
|
|
+
|
|
case 3:
|
|
case 3:
|
|
if (!Permissions.hasPermission(sender, "mcmmo.commands.addlevels.others")) {
|
|
if (!Permissions.hasPermission(sender, "mcmmo.commands.addlevels.others")) {
|
|
sender.sendMessage(command.getPermissionMessage());
|
|
sender.sendMessage(command.getPermissionMessage());
|
|
@@ -86,7 +87,7 @@ public class AddlevelsCommand implements CommandExecutor{
|
|
|
|
|
|
profile.addLevels(skill, levels);
|
|
profile.addLevels(skill, levels);
|
|
|
|
|
|
- // Check if the player is online before we try to send them a message.
|
|
|
|
|
|
+ // TODO: Is it even possible for the player to be offline at this point?
|
|
if (player.isOnline()) {
|
|
if (player.isOnline()) {
|
|
if (skill.equals(SkillType.ALL)) {
|
|
if (skill.equals(SkillType.ALL)) {
|
|
player.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", new Object[] {levels}));
|
|
player.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", new Object[] {levels}));
|