From b1d25bc45df987a7e55ede2a0529fc90986ad1c7 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 25 Sep 2014 13:11:29 +0300 Subject: Fix homunculus name detection. --- src/being/playerinfo.cpp | 2 +- src/net/eathena/homunculushandler.cpp | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/being/playerinfo.cpp b/src/being/playerinfo.cpp index 4f40b2c58..d4654c7be 100644 --- a/src/being/playerinfo.cpp +++ b/src/being/playerinfo.cpp @@ -522,7 +522,7 @@ void setHomunculus(HomunculusInfo *const info) void setHomunculusBeing(Being *const being) { - if (!being || !mPet) + if (!being || !mHomunculus) return; being->setName(mHomunculus->name); being->setOwner(localPlayer); diff --git a/src/net/eathena/homunculushandler.cpp b/src/net/eathena/homunculushandler.cpp index 36f634de0..8030bf4bb 100644 --- a/src/net/eathena/homunculushandler.cpp +++ b/src/net/eathena/homunculushandler.cpp @@ -170,16 +170,13 @@ void HomunculusHandler::processHomunculusInfo(Net::MessageIn &msg) return; Being *const dstBeing = actorManager->findBeing(info->id); - if (dstBeing) - { - info->name = name; - info->level = level; - info->range = range; - info->hungry = hungry; - info->intimacy = intimacy; - info->equip = equip; - PlayerInfo::setHomunculusBeing(dstBeing); - } + info->name = name; + info->level = level; + info->range = range; + info->hungry = hungry; + info->intimacy = intimacy; + info->equip = equip; + PlayerInfo::setHomunculusBeing(dstBeing); } } // namespace EAthena -- cgit v1.2.3-60-g2f50