EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-07-18 13:24:43 +02:00
Code Issues Projects Releases Wiki Activity

Switch /party invite to a subcommand

Browse Source
This commit is contained in:
GJ
2013-02-08 16:56:54 -05:00
parent ae5f39253e
commit 340c47eebd
3 changed files with 77 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/main/java/com/gmail/nossr50/party/commands/PartyCommand.java
View File

@ -28,6 +28,7 @@ public class PartyCommand implements CommandExecutor {
private CommandExecutor partyCreateCommand = new PartyCreateCommand();
private CommandExecutor partyQuitCommand = new PartyQuitCommand();
private CommandExecutor partyExpShareCommand = new PartyExpShareCommand();
private CommandExecutor partyInviteCommand = new PartyInviteCommand();
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
@ -75,7 +76,7 @@ public class PartyCommand implements CommandExecutor {
return shareItem();
}
else if (args[0].equalsIgnoreCase("invite")) {
return invite(args);
return partyInviteCommand.onCommand(sender, command, label, args);
}
else if (args[0].equalsIgnoreCase("kick")) {
return kick(args);
@ -191,49 +192,6 @@ public class PartyCommand implements CommandExecutor {
return true;
}
private boolean invite(String[] args) {
if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.invite")) {
return true;
}
switch (args.length) {
case 2:
if (!mcMMOPlayer.inParty()) {
player.sendMessage(LocaleLoader.getString("Commands.Party.None"));
return true;
}
Player target = mcMMO.p.getServer().getPlayer(args[1]);
if (target != null) {
if (PartyManager.inSameParty(player, target)) {
player.sendMessage(LocaleLoader.getString("Party.Player.InSameParty", target.getName()));
return true;
}
if (PartyManager.canInvite(player, mcMMOPlayer)) {
Party party = mcMMOPlayer.getParty();
Users.getPlayer(target).setPartyInvite(party);
player.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.0", party.getName(), player.getName()));
target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.1"));
return true;
}
player.sendMessage(LocaleLoader.getString("Party.Locked"));
return true;
}
player.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
return true;
default:
player.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "invite", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"));
return true;
}
}
/**
* Kick a party member
*/