Edit /mcc information with new party commands

`/party password` can now be used to clear the parties password when no
argument is provided.
Also improved feedback messages when managing your party.
This commit is contained in:
TfT_02
2013-01-29 13:16:28 +01:00
parent 5b862a4cee
commit 5bf1e49e43
23 changed files with 121 additions and 72 deletions

View File

@ -229,6 +229,7 @@ public final class PartyManager {
if (password != null) {
party.setPassword(password);
party.setLocked(true);
player.sendMessage(LocaleLoader.getString("Party.Password.Set", new Object[] {password}));
}
parties.add(party);
}

View File

@ -168,6 +168,11 @@ public class PartyCommand implements CommandExecutor {
return true;
}
if (party != null && party.equals(Users.getProfile(target).getParty())) {
player.sendMessage(LocaleLoader.getString("Party.Join.Self"));
return true;
}
String password = null;
if (args.length > 2) {
@ -554,20 +559,22 @@ public class PartyCommand implements CommandExecutor {
String playerName = player.getName();
Party party = playerProfile.getParty();
if (args.length < 2) {
player.sendMessage(LocaleLoader.getString("Commands.Usage.2", new Object[] {"party", "password", "<" + LocaleLoader.getString("Commands.Usage.Password") + ">"}));
if (!party.getLeader().equals(playerName)) {
player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
return true;
}
if (party.getLeader().equals(playerName)) {
if (args.length < 2) {
party.setLocked(true);
party.setPassword(args[1]);
player.sendMessage(LocaleLoader.getString("Party.PasswordSet", new Object[] {args[1]}));
}
else {
player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
party.setPassword(null);
player.sendMessage(LocaleLoader.getString("Party.Password.Removed"));
return true;
}
party.setLocked(true);
party.setPassword(args[1]);
player.sendMessage(LocaleLoader.getString("Party.Password.Set", new Object[] {args[1]}));
return true;
}