diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-07-23 15:14:14 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-07-23 15:14:14 +0000 |
| commit | 81bfbbfb9c0f5af32e55f66ccea2d444eb76cabc (patch) | |
| tree | b539a8e2d76c4cf5fcc95ad641ff1d71a66893f0 /src/map/battle.c | |
| parent | 98cabc236656a475473c7b4c07a81210a1eb9541 (diff) | |
| download | hercules-81bfbbfb9c0f5af32e55f66ccea2d444eb76cabc.tar.gz hercules-81bfbbfb9c0f5af32e55f66ccea2d444eb76cabc.tar.bz2 hercules-81bfbbfb9c0f5af32e55f66ccea2d444eb76cabc.tar.xz hercules-81bfbbfb9c0f5af32e55f66ccea2d444eb76cabc.zip | |
reverting r16476, for 1) after extensive debugging cookie and I found out it wasn't related to the crashes on the report and 2) it breaks the official behavior of reflect shield.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16484 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index a04f3c328..e82b14247 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -200,7 +200,7 @@ int battle_delay_damage_sub(int tid, unsigned int tick, int id, intptr_t data) { struct delay_damage *dat = (struct delay_damage *)data; - if ( dat && dat->target && map_id2bl(id) == dat->src && dat->target->prev != NULL && !status_isdead(dat->target) ) { + if ( dat && dat->target && dat->target->prev != NULL && !status_isdead(dat->target) ) { if( dat->src && dat->src->prev != NULL && id == dat->src->id && dat->target->m == dat->src->m && (dat->target->type != BL_PC || ((TBL_PC*)dat->target)->invincible_timer == INVALID_TIMER) && |