summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorgepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-16 15:40:58 +0000
committergepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-16 15:40:58 +0000
commit9e6b684089d6b3008e6d3c693f86d89d6420b1fc (patch)
tree68a837be6807a42dbc89575e2439c9a0b31e7a60 /src/map
parent85972965d5a2abd5fbf6e94fa759f9c192be9e13 (diff)
downloadhercules-9e6b684089d6b3008e6d3c693f86d89d6420b1fc.tar.gz
hercules-9e6b684089d6b3008e6d3c693f86d89d6420b1fc.tar.bz2
hercules-9e6b684089d6b3008e6d3c693f86d89d6420b1fc.tar.xz
hercules-9e6b684089d6b3008e6d3c693f86d89d6420b1fc.zip
Fixed returning pet to egg not cleaning up remaining skill timers, causing map-server crash.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15468 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/unit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/unit.c b/src/map/unit.c
index e4376b01d..9fd005c60 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -1980,7 +1980,7 @@ int unit_remove_map_(struct block_list *bl, clr_type clrtype, const char* file,
status_change_end(bl, SC_STOP, INVALID_TIMER);
}
- if (bl->type&BL_CHAR) {
+ if (bl->type&(BL_CHAR|BL_PET)) {
skill_unit_move(bl,gettick(),4);
skill_cleartimerskill(bl);
}