From 1c328e7ac73621d16966fcb9e7ccfe69d6f11f35 Mon Sep 17 00:00:00 2001
From: TfT_02 <tft_02@hotmail.com>
Date: Tue, 5 Feb 2013 14:46:56 +0100
Subject: [PATCH] Fixed a bug which made it impossible to join other players'
 parties.

---
 Changelog.txt                                               | 1 +
 .../java/com/gmail/nossr50/party/commands/PartyCommand.java | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index bbe77a706..3b84b58f7 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -35,6 +35,7 @@ Version 1.4.00-dev
  = Fixed bug where all skill guide headers appeared as "Skillname Guide Guide"
  = Fixed bug where Impact was applied incorrectly due to an inverted method call
  = Fixed bug where Impact improperly determined the defender's armor
+ = Fixed a bug which made it impossible to join other players' parties
  = Fixed ArrayIndexOutOfBoundsException resulting from being unranked in a skill when using FlatFile
  = Fixed Woodcutting accidentally using Mining double drop values.
  = Fixed Hylian Luck not removing the block-placed flag from flowers.
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 58426a328..7e0f83140 100644
--- a/src/main/java/com/gmail/nossr50/party/commands/PartyCommand.java
+++ b/src/main/java/com/gmail/nossr50/party/commands/PartyCommand.java
@@ -186,7 +186,9 @@ public class PartyCommand implements CommandExecutor {
             return false;
         }
 
-        if (!mcMMOPlayer.inParty()) {
+        McMMOPlayer mcMMOTarget = Users.getPlayer(target);
+
+        if (!mcMMOTarget.inParty()) {
             player.sendMessage(LocaleLoader.getString("Party.PlayerNotInParty", args[1]));
             return false;
         }
@@ -209,7 +211,7 @@ public class PartyCommand implements CommandExecutor {
             password = args[2];
         }
 
-        Party targetParty = Users.getPlayer(target).getParty();
+        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)) {