EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-09-19 11:07:55 +02:00
Code Issues Projects Releases Wiki Activity

We only need the name here, avoids NPE issues in /party create.

Browse Source 
Fixes #655
This commit is contained in:
GJ
2013-02-09 00:57:00 -05:00
parent 340c47eebd
commit a2cbfa2668
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,7 @@ public class PartyAcceptCommand implements CommandExecutor {
// Changing parties
if (!PartyManager.changeOrJoinParty(mcMMOPlayer, player, mcMMOPlayer.getParty(), mcMMOPlayer.getPartyInvite())) {
if (!PartyManager.changeOrJoinParty(mcMMOPlayer, player, mcMMOPlayer.getParty(), mcMMOPlayer.getPartyInvite().getName())) {
return true;
}

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

@@ -38,7 +38,7 @@ public class PartyCreateCommand implements CommandExecutor {
mcMMOPlayer = Users.getPlayer(player);
// Changing parties
if (!PartyManager.changeOrJoinParty(mcMMOPlayer, player, mcMMOPlayer.getParty(), newParty)) {
if (!PartyManager.changeOrJoinParty(mcMMOPlayer, player, mcMMOPlayer.getParty(), args[1])) {
return true;
}

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

@@ -45,7 +45,7 @@ public class PartyJoinCommand implements CommandExecutor {
}
// Changing parties
if (!PartyManager.changeOrJoinParty(mcMMOPlayer, player, playerParty, targetParty)) {
if (!PartyManager.changeOrJoinParty(mcMMOPlayer, player, playerParty, targetParty.getName())) {
return true;
}