From 5ed710e084608dbd9aaf3a9af1b12719a938ac43 Mon Sep 17 00:00:00 2001 From: Matias Date: Tue, 25 Jun 2013 02:23:22 -0400 Subject: - Fixing battle->calc_cardfix applying target's cards twice on PvP/Cart Termination. --- src/map/battle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/map/battle.c b/src/map/battle.c index 370adcd02..280867b0a 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -629,7 +629,7 @@ int battle_calc_cardfix(int attack_type, struct block_list *src, struct block_li else if( cardfix != 1000 ) damage = damage * cardfix / 1000; - }else if( tsd && !(nk&NK_NO_CARDFIX_DEF) ){ + }else if( tsd && !(nk&NK_NO_CARDFIX_DEF) && !(left&2 )){ if( !(nk&NK_NO_ELEFIX) ) { int ele_fix = tsd->subele[s_ele]; -- cgit v1.2.3-70-g09d2