From 9ba5360bfcda037050254164e02e8955771c29f7 Mon Sep 17 00:00:00 2001 From: GJ Date: Thu, 28 Jun 2012 08:14:30 -0400 Subject: [PATCH] Cleaned up inSameParty method --- .../java/com/gmail/nossr50/party/PartyManager.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/party/PartyManager.java b/src/main/java/com/gmail/nossr50/party/PartyManager.java index 614306d67..c92ba83b1 100644 --- a/src/main/java/com/gmail/nossr50/party/PartyManager.java +++ b/src/main/java/com/gmail/nossr50/party/PartyManager.java @@ -41,18 +41,10 @@ public class PartyManager { * @return true if they are in the same party, false otherwise */ public boolean inSameParty(Player firstPlayer, Player secondPlayer) { - if (Users.getProfile(firstPlayer) == null) { - plugin.getLogger().info("The defending player's profile was null."); - plugin.getLogger().info("This player is online: " + firstPlayer.isOnline()); - return false; - } + Party firstParty = Users.getProfile(firstPlayer).getParty(); + Party secondParty = Users.getProfile(secondPlayer).getParty(); - if (Users.getProfile(secondPlayer) == null) { - plugin.getLogger().info("The attacking player's profile was null."); - plugin.getLogger().info("This player is online: " + secondPlayer.isOnline()); - return false; - } - if (Users.getProfile(firstPlayer).getParty() == null || Users.getProfile(secondPlayer).getParty() == null || !Users.getProfile(firstPlayer).getParty().equals(Users.getProfile(secondPlayer).getParty())) { + if (firstParty == null || secondParty == null || firstParty != secondParty) { return false; }