From 3550c25b7dc00d5db80c928563c76bf4d4ee3c3c Mon Sep 17 00:00:00 2001 From: GJ Date: Tue, 5 Feb 2013 09:59:03 -0500 Subject: [PATCH] targetParty could have been null going into the PartyChangeEvent. --- .../java/com/gmail/nossr50/party/commands/PartyCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gmail/nossr50/party/commands/PartyCommand.java b/src/main/java/com/gmail/nossr50/party/commands/PartyCommand.java index 7e0f83140..73310362a 100644 --- a/src/main/java/com/gmail/nossr50/party/commands/PartyCommand.java +++ b/src/main/java/com/gmail/nossr50/party/commands/PartyCommand.java @@ -214,7 +214,7 @@ public class PartyCommand implements CommandExecutor { Party targetParty = mcMMOTarget.getParty(); // Check to see if the party exists, and if it does, can the player join it? - if (targetParty != null && !PartyManager.checkJoinability(player, targetParty, null)) { + if (targetParty == null || !PartyManager.checkJoinability(player, targetParty, null)) { return true; // End before any event is fired. }