소스 검색

Fixed NPE on /party join when the sender isn't in a party
Also cleaned up PartyManager.joinParty since it's no longer supposed
to create any party.

bm01 12 년 전
부모
커밋
ccedd23342
2개의 변경된 파일4개의 추가작업 그리고 20개의 파일을 삭제
  1. 3 19
      src/main/java/com/gmail/nossr50/party/PartyManager.java
  2. 1 1
      src/main/java/com/gmail/nossr50/party/commands/PartyJoinCommand.java

+ 3 - 19
src/main/java/com/gmail/nossr50/party/PartyManager.java

@@ -287,27 +287,11 @@ public final class PartyManager {
      *
      * @param player The player to add to the party
      * @param mcMMOPlayer The player to add to the party
-     * @param partyName The party to add the player to
+     * @param party The party to add the player to
      * @param password the password for this party, null if there was no password
      */
-    public static void joinParty(Player player, McMMOPlayer mcMMOPlayer, String partyName, String password) {
-        partyName = partyName.replace(".", "");
-        Party party = getParty(partyName);
-
-        if (party == null) {
-            party = new Party();
-
-            party.setName(partyName);
-            party.setLeader(player.getName());
-
-            if (password != null) {
-                party.setPassword(password);
-                party.setLocked(true);
-            }
-
-            parties.add(party);
-        }
-        else if (!checkPartyPassword(player, party, password)) {
+    public static void joinParty(Player player, McMMOPlayer mcMMOPlayer, Party party, String password) {
+        if (!checkPartyPassword(player, party, password)) {
             return;
         }
 

+ 1 - 1
src/main/java/com/gmail/nossr50/party/commands/PartyJoinCommand.java

@@ -49,7 +49,7 @@ public class PartyJoinCommand implements CommandExecutor {
                 return true;
             }
 
-            PartyManager.joinParty(player, mcMMOPlayer, playerParty.getName(), password);
+            PartyManager.joinParty(player, mcMMOPlayer, targetParty, password);
             return true;
 
         default: