From 7e48e6cc160d62a996e7fc56c17d4fbe24c6f2a2 Mon Sep 17 00:00:00 2001 From: xazax-hun Date: Sun, 25 Dec 2011 20:06:48 +0000 Subject: Fixed a crash bug caused by clones that were committing suicide with PA_SACRAFICE. bugreport:4950 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15277 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/battle.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/map') diff --git a/src/map/battle.c b/src/map/battle.c index aa494c3e4..c474ba69b 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3705,6 +3705,11 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t if (sc->data[SC_SACRIFICE]) { int skilllv = sc->data[SC_SACRIFICE]->val1; + /** + * We need to calculate the DMG before the hp reduction, because it can kill the source. + * For futher information: bugreport:4950 + **/ + damage_lv ret_val = (damage_lv)skill_attack(BF_WEAPON,src,src,target,PA_SACRIFICE,skilllv,tick,0); if( --sc->data[SC_SACRIFICE]->val2 <= 0 ) status_change_end(src, SC_SACRIFICE, INVALID_TIMER); @@ -3712,7 +3717,7 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t status_zap(src, sstatus->max_hp*9/100, 0);//Damage to self is always 9% //FIXME: invalid return type! - return (damage_lv)skill_attack(BF_WEAPON,src,src,target,PA_SACRIFICE,skilllv,tick,0); + return ret_val; } if (sc->data[SC_MAGICALATTACK]) //FIXME: invalid return type! -- cgit v1.2.3-70-g09d2