Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-28 03:27:39 +01:00
Code Issues Projects Releases Wiki Activity

This is better too.

Browse Source
This commit is contained in:
GJ 2013-08-26 12:20:56 -04:00
parent a17d1d3a2f
commit 435522415d
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java
View File

@ -40,13 +40,12 @@ public class PartyInviteCommand implements CommandExecutor {
return true;
}
Party playerParty = mcMMOPlayer.getParty();
if (!PartyManager.canInvite(playerName, playerParty)) {
if (!PartyManager.canInvite(mcMMOPlayer)) {
player.sendMessage(LocaleLoader.getString("Party.Locked"));
return true;
}
Party playerParty = mcMMOPlayer.getParty();
mcMMOTarget.setPartyInvite(playerParty);
sender.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));

6
src/main/java/com/gmail/nossr50/party/PartyManager.java
View File

@ -378,8 +378,10 @@ public final class PartyManager {
* @param party The party to check
* @return true if the player can invite
*/
public static boolean canInvite(String playerName, Party party) {
return !party.isLocked() || party.getLeader().equalsIgnoreCase(playerName);
public static boolean canInvite(McMMOPlayer mcMMOPlayer) {
Party party = mcMMOPlayer.getParty();
return !party.isLocked() || party.getLeader().equalsIgnoreCase(mcMMOPlayer.getPlayer().getName());
}
/**