Convert /party owner to a subcommand.

This commit is contained in:
GJ
2013-02-11 15:33:25 -05:00
parent e8ac3c812f
commit e66ff53ca4
2 changed files with 51 additions and 29 deletions

View File

@ -32,6 +32,7 @@ public class PartyCommand implements CommandExecutor {
private CommandExecutor partyInviteCommand = new PartyInviteCommand();
private CommandExecutor partyKickCommand = new PartyKickCommand();
private CommandExecutor partyDisbandCommand = new PartyDisbandCommand();
private CommandExecutor partyChangeOwnerCommand = new PartyChangeOwnerCommand();
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
@ -88,7 +89,7 @@ public class PartyCommand implements CommandExecutor {
return partyDisbandCommand.onCommand(sender, command, label, args);
}
else if (args[0].equalsIgnoreCase("owner")) {
return changeOwner(args);
return partyChangeOwnerCommand.onCommand(sender, command, label, args);
}
else if (args[0].equalsIgnoreCase("lock")) {
return lock();
@ -190,34 +191,6 @@ public class PartyCommand implements CommandExecutor {
return true;
}
/**
* Change the owner of the current party
*/
private boolean changeOwner(String[] args) {
if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.owner")) {
return true;
}
String playerName = player.getName();
Party party = mcMMOPlayer.getParty();
if (args.length < 2) {
player.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "owner", "[" + LocaleLoader.getString("Commands.Usage.Player") + "]"));
return true;
}
if (party.getLeader().equals(playerName)) {
if (!party.getMembers().contains(mcMMO.p.getServer().getOfflinePlayer(args[1]))) {
player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", args[1]));
return true;
}
PartyManager.setPartyLeader(args[1], party);
}
return true;
}
/**
* Lock the current party
*/