Fixed bug that caused NPE when trying to compare null parties

This commit is contained in:
nossr50
2012-06-24 12:48:03 -07:00
parent c4cd677021
commit ab7b6ce460
2 changed files with 5 additions and 0 deletions

View File

@ -41,6 +41,10 @@ public class PartyManager {
* @return true if they are in the same party, false otherwise
*/
public boolean inSameParty(Player firstPlayer, Player secondPlayer) {
//Since party can be null at times, we need to make sure that it isn't null here
if(Users.getProfile(firstPlayer).getParty() == null || Users.getProfile(secondPlayer).getParty() == null)
return false;
Party firstParty = Users.getProfile(firstPlayer).getParty();
Party secondParty = Users.getProfile(secondPlayer).getParty();