2 files changed, 16 insertions, 11 deletions
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index e2617dc98..9707475da 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -28,6 +28,8 @@
 #include "party.h"
 
 #include "being/localplayer.h"
+#include "being/mercenaryinfo.h"
+#include "being/playerinfo.h"
 
 #include "input/keyboardconfig.h"
 
@@ -325,7 +327,14 @@ Being *BeingHandler::createBeing2(const int id,
     if (job == 45 && beingType == BeingType::NPC_EVENT)
         type = ActorType::Portal;
 
-    return actorManager->createBeing(id, type, job);
+    Being *const being = actorManager->createBeing(id, type, job);
+    if (beingType == BeingType::MERSOL)
+    {
+        MercenaryInfo *const info = PlayerInfo::getMercenary();
+        if (info && info->id == id)
+            PlayerInfo::setMercenaryBeing(being);
+    }
+    return being;
 }
 
 void BeingHandler::undress(Being *const being) const
diff --git a/src/net/eathena/mercenaryhandler.cpp b/src/net/eathena/mercenaryhandler.cpp
index 0726f5281..d197b6101 100644
--- a/src/net/eathena/mercenaryhandler.cpp
+++ b/src/net/eathena/mercenaryhandler.cpp
@@ -110,19 +110,15 @@ void MercenaryHandler::processMercenaryInfo(Net::MessageIn &msg)
     msg.readInt32("calls");
     msg.readInt32("kills");
     const int range = msg.readInt16("attack range");
-    if (dstBeing)
+    if (dstBeing && localPlayer)
     {
-        dstBeing->setName(name);
+        MercenaryInfo *const mercenary = new MercenaryInfo;
+        mercenary->id = dstBeing->getId();
+        mercenary->name = name;
+        PlayerInfo::setMercenary(mercenary);
+        PlayerInfo::setMercenaryBeing(dstBeing);
         dstBeing->setLevel(level);
         dstBeing->setAttackRange(range);
-        dstBeing->setOwner(localPlayer);
-        if (localPlayer)
-        {
-            MercenaryInfo *const mercenary = new MercenaryInfo;
-            mercenary->id = dstBeing->getId();
-            mercenary->name = name;
-            PlayerInfo::setMercenary(mercenary);
-        }
     }
 }