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

Make /party join into a subcommand.

Browse Source
This commit is contained in:
GJ
2013-02-07 21:46:12 -05:00
parent 02bccf6dc1
commit 3ccf79cff5
4 changed files with 131 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,8 @@ public class PartyCommand implements CommandExecutor {
private McMMOPlayer mcMMOPlayer;
private Player player;
private CommandExecutor partyJoinCommand = new PartyJoinCommand();
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (CommandHelper.noConsoleUsage(sender)) {
@ -41,7 +43,7 @@ public class PartyCommand implements CommandExecutor {
}
if (args[0].equalsIgnoreCase("join")) {
return join(args);
return partyJoinCommand.onCommand(sender, command, label, args);
}
else if (args[0].equalsIgnoreCase("accept")) {
return accept();
@ -169,79 +171,6 @@ public class PartyCommand implements CommandExecutor {
return true;
}
private boolean join(String[] args) {
if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.join")) {
return true;
}
if (args.length < 2) {
player.sendMessage(LocaleLoader.getString("Party.Help.0"));
return true;
}
Player target = mcMMO.p.getServer().getPlayer(args[1]);
if (target == null) {
player.sendMessage(LocaleLoader.getString("Party.NotOnline", args[1]));
return false;
}
McMMOPlayer mcMMOTarget = Users.getPlayer(target);
if (!mcMMOTarget.inParty()) {
player.sendMessage(LocaleLoader.getString("Party.PlayerNotInParty", args[1]));
return false;
}
if (player.equals(target)) {
player.sendMessage(LocaleLoader.getString("Party.Join.Self"));
return true;
}
Party party = mcMMOPlayer.getParty();
if (party != null && party.equals(Users.getPlayer(target).getParty())) {
player.sendMessage(LocaleLoader.getString("Party.Join.Self"));
return true;
}
String password = null;
if (args.length > 2) {
password = args[2];
}
Party targetParty = mcMMOTarget.getParty();
// Check to see if the party exists, and if it does, can the player join it?
if (targetParty == null || !PartyManager.checkJoinability(player, targetParty, null)) {
return true; // End before any event is fired.
}
if (party != null) {
McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, party.getName(), targetParty.getName(), EventReason.CHANGED_PARTIES);
mcMMO.p.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
return true;
}
PartyManager.removeFromParty(player.getName(), party);
}
else {
McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, null, targetParty.getName(), EventReason.JOINED_PARTY);
mcMMO.p.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
return true;
}
}
PartyManager.joinParty(player, mcMMOPlayer, targetParty.getName(), password);
return true;
}
private boolean accept() {
if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.accept")) {
return true;