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

Convert /party lock & /party unlock to a subcommand.

Browse Source
This commit is contained in:
GJ
2013-02-11 17:31:09 -05:00
parent 2d6fb72b9d
commit 98a64a0948
2 changed files with 102 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,7 @@ public class PartyCommand implements CommandExecutor {
private CommandExecutor partyKickCommand = new PartyKickCommand();
private CommandExecutor partyDisbandCommand = new PartyDisbandCommand();
private CommandExecutor partyChangeOwnerCommand = new PartyChangeOwnerCommand();
private CommandExecutor partyLockCommand = new PartyLockCommand();
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
@ -91,11 +92,8 @@ public class PartyCommand implements CommandExecutor {
else if (args[0].equalsIgnoreCase("owner")) {
return partyChangeOwnerCommand.onCommand(sender, command, label, args);
}
else if (args[0].equalsIgnoreCase("lock")) {
return lock();
}
else if (args[0].equalsIgnoreCase("unlock")) {
return unlock();
else if (args[0].equalsIgnoreCase("lock") || args[0].equalsIgnoreCase("unlock")) {
return partyLockCommand.onCommand(sender, command, label, args);
}
else if (args[0].equalsIgnoreCase("password")) {
return changePassword(args);
@ -191,69 +189,6 @@ public class PartyCommand implements CommandExecutor {
return true;
}
/**
* Lock the current party
*/
private boolean lock() {
if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.lock")) {
return true;
}
String playerName = player.getName();
Party party = mcMMOPlayer.getParty();
if (party == null) {
player.sendMessage("Commands.Party.None");
return true;
}
if (!party.getLeader().equals(playerName)) {
player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
return true;
}
if (party.isLocked()) {
player.sendMessage(LocaleLoader.getString("Party.IsLocked"));
}
else {
party.setLocked(true);
player.sendMessage(LocaleLoader.getString("Party.Locked"));
}
return true;
}
/**
* Unlock the current party
*/
private boolean unlock() {
if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.unlock")) {
return true;
}
String playerName = player.getName();
Party party = mcMMOPlayer.getParty();
if (party == null) {
player.sendMessage("Commands.Party.None");
return true;
}
if (!party.getLeader().equals(playerName)) {
player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
return true;
}
if (!party.isLocked()) {
player.sendMessage(LocaleLoader.getString("Party.IsntLocked"));
}
else {
party.setLocked(false);
player.sendMessage(LocaleLoader.getString("Party.Unlocked"));
}
return true;
}
private boolean changePassword(String[] args) {
if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.password")) {
return true;