Convert /party quit to a subcommand

This commit is contained in:
GJ
2013-02-08 10:26:59 -05:00
parent 6d9db06305
commit ae3a95dd34
2 changed files with 51 additions and 26 deletions

View File

@ -26,6 +26,7 @@ public class PartyCommand implements CommandExecutor {
private CommandExecutor partyJoinCommand = new PartyJoinCommand();
private CommandExecutor partyAcceptCommand = new PartyAcceptCommand();
private CommandExecutor partyCreateCommand = new PartyCreateCommand();
private CommandExecutor partyQuitCommand = new PartyQuitCommand();
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
@ -59,7 +60,7 @@ public class PartyCommand implements CommandExecutor {
if (mcMMOPlayer.inParty()) {
if (args[0].equalsIgnoreCase("quit") || args[0].equalsIgnoreCase("q") || args[0].equalsIgnoreCase("leave")) {
return quit();
return partyQuitCommand.onCommand(sender, command, label, args);
}
else if (args[0].equalsIgnoreCase("expshare")) {
return shareExp(args);
@ -173,31 +174,6 @@ public class PartyCommand implements CommandExecutor {
return true;
}
private boolean quit() {
if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.quit")) {
return true;
}
String playerName = player.getName();
Party party = mcMMOPlayer.getParty();
if (party != null) {
McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, party.getName(), null, EventReason.LEFT_PARTY);
mcMMO.p.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
return true;
}
PartyManager.removeFromParty(playerName, party);
player.sendMessage(LocaleLoader.getString("Commands.Party.Leave"));
}
else {
player.sendMessage(LocaleLoader.getString("Commands.Party.None"));
}
return false;
}
private boolean shareExp(String[] args) {
if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.expshare")) {
return true;