浏览代码

Fixed a crash bug caused by clones that were committing suicide with PA_SACRAFICE. bugreport:4950

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15277 54d463be-8e91-2dee-dedb-b68131a5f0ec
xazax-hun 13 年之前
父节点
当前提交
122c63765e
共有 1 个文件被更改,包括 6 次插入1 次删除
  1. 6 1
      src/map/battle.c

+ 6 - 1
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!