Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-02 00:30:07 +01:00
Code Issues Projects Releases Wiki Activity

Fixed NPE on /party join when the sender isn't in a party

Browse Source 
Also cleaned up PartyManager.joinParty since it's no longer supposed
to create any party.
This commit is contained in:
bm01 2013-02-09 16:21:13 +01:00
parent 46b5746dcc
commit ccedd23342
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
}

2
src/main/java/com/gmail/nossr50/party/commands/PartyJoinCommand.java
View File

@ -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: