From 24eb34c1820dd6d86a7881eef26c3d59e6f2bf3b Mon Sep 17 00:00:00 2001 From: nossr50 Date: Sun, 24 Jun 2012 13:26:21 -0700 Subject: [PATCH] Back to the old way of doing things --- .../java/com/gmail/nossr50/party/PartyManager.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/party/PartyManager.java b/src/main/java/com/gmail/nossr50/party/PartyManager.java index 91bc107bc..e3834ae80 100644 --- a/src/main/java/com/gmail/nossr50/party/PartyManager.java +++ b/src/main/java/com/gmail/nossr50/party/PartyManager.java @@ -41,14 +41,8 @@ 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(); - - if (firstParty == null || secondParty == null || firstParty != secondParty) { + if (Users.getProfile(firstPlayer).getParty() == null || Users.getProfile(secondPlayer).getParty() == null + || Users.getProfile(firstPlayer).getParty().equals(Users.getProfile(secondPlayer).getParty())) { return false; }