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

Change /party kick to a subcommand

Browse Source
This commit is contained in:
GJ
2013-02-11 00:25:03 -05:00
parent 2be57414ad
commit 5da51e78cc
2 changed files with 83 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@ public class PartyCommand implements CommandExecutor {
private CommandExecutor partyExpShareCommand = new PartyExpShareCommand();
private CommandExecutor partyItemShareCommand = new PartyItemShareCommand();
private CommandExecutor partyInviteCommand = new PartyInviteCommand();
private CommandExecutor partyKickCommand = new PartyKickCommand();
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
@ -80,7 +81,7 @@ public class PartyCommand implements CommandExecutor {
return partyInviteCommand.onCommand(sender, command, label, args);
}
else if (args[0].equalsIgnoreCase("kick")) {
return kick(args);
return partyKickCommand.onCommand(sender, command, label, args);
}
else if (args[0].equalsIgnoreCase("disband")) {
return disband();
@ -188,55 +189,6 @@ public class PartyCommand implements CommandExecutor {
return true;
}
/**
* Kick a party member
*/
private boolean kick(String[] args) {
if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.kick")) {
return true;
}
switch (args.length) {
case 2:
String playerName = player.getName();
Party party = mcMMOPlayer.getParty();
if (party.getLeader().equals(playerName)) {
OfflinePlayer member = mcMMO.p.getServer().getOfflinePlayer(args[1]);
if (!party.getMembers().contains(member)) {
player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", args[1]));
return true;
}
if (member.isOnline()) {
Player onlineMember = member.getPlayer();
String partyName = party.getName();
McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(onlineMember, partyName, null, EventReason.KICKED_FROM_PARTY);
mcMMO.p.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
return true;
}
onlineMember.sendMessage(LocaleLoader.getString("Commands.Party.Kick", partyName));
}
PartyManager.removeFromParty(member, party);
}
else {
player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
}
return true;
default:
player.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "kick", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"));
return true;
}
}
/**
* Disband the current party, kicks out all party members.
*/