소스 검색

This is better too.

GJ 11 년 전
부모
커밋
435522415d

+ 2 - 3
src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java

@@ -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"));

+ 4 - 2
src/main/java/com/gmail/nossr50/party/PartyManager.java

@@ -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());
     }
 
     /**