From c079423d172fa772e6b56262f80c09cd0e5a7f47 Mon Sep 17 00:00:00 2001 From: shennetsind Date: Thu, 11 Apr 2013 16:26:34 -0300 Subject: Follow up 80ca4067115774d6c1c447072b470d5f69ab5883 Improved, previous fix would screw up when non-player unit attacked a player. Signed-off-by: shennetsind --- src/map/battle.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/map/battle.c b/src/map/battle.c index 81c616928..b6180328a 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3394,10 +3394,10 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list if( index >= 0 && sd->inventory_data[index] && sd->inventory_data[index]->type == IT_ARMOR ) ATK_ADD(10*sd->status.inventory[index].refine); } - } //if (sd) + } //Card Fix, tsd side - if(tsd) + if(!sd && tsd) //if player on player then it was already measured above wd.damage = battle->calc_cardfix(BF_WEAPON, src, target, nk, s_ele, s_ele_, wd.damage, flag.lh, wd.flag); if( flag.infdef ) -- cgit v1.2.3-70-g09d2