summaryrefslogtreecommitdiff
path: root/src/map/status.c
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-07-29 01:59:38 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-07-29 01:59:38 +0000
commit60c0cfd6bcc66be6ea3648b0e2810cfb60f75aed (patch)
tree5cfe4cd08897c00ea8cc10cd0a3be1bf452dbcfa /src/map/status.c
parentbfc097da65478acd0fff4414621f705bcc2cd739 (diff)
downloadhercules-60c0cfd6bcc66be6ea3648b0e2810cfb60f75aed.tar.gz
hercules-60c0cfd6bcc66be6ea3648b0e2810cfb60f75aed.tar.bz2
hercules-60c0cfd6bcc66be6ea3648b0e2810cfb60f75aed.tar.xz
hercules-60c0cfd6bcc66be6ea3648b0e2810cfb60f75aed.zip
Fixed bugreport:6324 mobs now clear attacked data on death. special thanks to vali.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16527 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
-rw-r--r--src/map/status.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/map/status.c b/src/map/status.c
index fbeb7214f..fb9d8320c 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1204,8 +1204,7 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s
status_change_end(target, SC_SATURDAYNIGHTFEVER, INVALID_TIMER);
}
- switch (target->type)
- {
+ switch (target->type) {
case BL_PC: pc_damage((TBL_PC*)target,src,hp,sp); break;
case BL_MOB: mob_damage((TBL_MOB*)target, src, hp); break;
case BL_HOM: merc_damage((TBL_HOM*)target,src,hp,sp); break;
@@ -1213,8 +1212,7 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s
case BL_ELEM: elemental_damage((TBL_ELEM*)target,src,hp,sp); break;
}
- if( target->type == BL_PC && ((TBL_PC*)target)->disguise && src )
- {// stop walking when attacked in disguise to prevent walk-delay bug
+ if( src && target->type == BL_PC && ((TBL_PC*)target)->disguise ) {// stop walking when attacked in disguise to prevent walk-delay bug
unit_stop_walking( target, 1 );
}