From 5ce3ea5e8377a1f9898dc08b6cc7f3a9679f4232 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 21 Sep 2014 15:19:48 +0300
Subject: Restore mercenary stats if it was respawned.

---
 src/net/eathena/mercenaryhandler.cpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'src/net/eathena/mercenaryhandler.cpp')

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);
-        }
     }
 }
 
-- 
cgit v1.2.3-60-g2f50