summaryrefslogtreecommitdiff
path: root/src/net/eathena
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-02-23 00:20:47 +0300
committerAndrei Karas <akaras@inbox.ru>2015-02-23 00:21:10 +0300
commitdd1c7257b760f4c97c84e66d4ebb4f32fff8a499 (patch)
treeba75dfbdff9b7f7279fd20ecf9a78fc6d959cd03 /src/net/eathena
parent839cb18574b493cfbf66c03aa031bd040b2a7972 (diff)
downloadplus-dd1c7257b760f4c97c84e66d4ebb4f32fff8a499.tar.gz
plus-dd1c7257b760f4c97c84e66d4ebb4f32fff8a499.tar.bz2
plus-dd1c7257b760f4c97c84e66d4ebb4f32fff8a499.tar.xz
plus-dd1c7257b760f4c97c84e66d4ebb4f32fff8a499.zip
eathena: fix crash if pet went outside of visible area.
Diffstat (limited to 'src/net/eathena')
-rw-r--r--src/net/eathena/beinghandler.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 301c90b93..fbf3fc78b 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -366,6 +366,11 @@ Being *BeingHandler::createBeing2(const int id,
if (info && info->id == id)
PlayerInfo::setMercenaryBeing(being);
}
+ else if (beingType == BeingType::PET)
+ {
+ if (PlayerInfo::getPetBeingId() == id)
+ PlayerInfo::setPetBeing(being);
+ }
return being;
}