Merge pull request #237 from StrangeOne101/master

Fix Choose Command Errors
This commit is contained in:
OmniCypher 2015-09-07 21:41:34 -07:00
commit 5f3d8e5b45

View file

@ -64,7 +64,7 @@ public class ChooseCommand extends PKCommand {
return; return;
} }
Player target = ProjectKorra.plugin.getServer().getPlayer(args.get(1)); Player target = ProjectKorra.plugin.getServer().getPlayer(args.get(1));
if (!target.isOnline()) { if (target == null || !target.isOnline()) {
sender.sendMessage(ChatColor.RED + "That player is not online."); sender.sendMessage(ChatColor.RED + "That player is not online.");
return; return;
} }
@ -103,7 +103,7 @@ public class ChooseCommand extends PKCommand {
sender.sendMessage(ChatColor.DARK_AQUA + target.getName() + color + " is now an " + Character.toString(element.charAt(0)).toUpperCase() + element.substring(1) + "bender."); sender.sendMessage(ChatColor.DARK_AQUA + target.getName() + color + " is now an " + Character.toString(element.charAt(0)).toUpperCase() + element.substring(1) + "bender.");
} }
} }
GeneralMethods.removeUnusableAbilities(sender.getName()); GeneralMethods.removeUnusableAbilities(target.getName());
GeneralMethods.saveElements(bPlayer); GeneralMethods.saveElements(bPlayer);
Bukkit.getServer().getPluginManager().callEvent(new PlayerChangeElementEvent(sender, target, e, Result.CHOOSE)); Bukkit.getServer().getPluginManager().callEvent(new PlayerChangeElementEvent(sender, target, e, Result.CHOOSE));
} }