1 files changed, 8 insertions, 3 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 29ed733a..5a49442c 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -35,6 +35,8 @@
 #include "npc.h"
 #include "playerrelations.h"
 
+#include "gui/partywindow.h"
+
 #include <iostream>
 
 namespace EAthena {
@@ -445,12 +447,15 @@ void BeingHandler::handleMessage(MessageIn &msg)
                 dstBeing = createBeing(id, job);
             }
 
-            // Fix monster jobs
-            if (dstBeing->getType() == Being::MONSTER)
             {
-                job -= 1002;
+                PartyMember *member = partyWindow->findMember(id);
+                if (member && member->online)
+                {
+                    dynamic_cast<Player*>(dstBeing)->setInParty(true);
+                }
             }
 
+
             dstBeing->setWalkSpeed(speed);
             dstBeing->mJob = job;
             hairStyle = msg.readInt16();