diff options
| author | Matias <matiassw@gmail.com> | 2013-06-25 13:53:51 -0400 |
|---|---|---|
| committer | Matias <matiassw@gmail.com> | 2013-06-25 13:53:51 -0400 |
| commit | 25914bae30eced388cf8640eead19fbb11a65ade (patch) | |
| tree | f4144fbe0220eb19dd2bf8f1aa3135275505ec95 /src/map/battle.c | |
| parent | 884424e83290729598f57502e9a273f502bc1b50 (diff) | |
| download | hercules-25914bae30eced388cf8640eead19fbb11a65ade.tar.gz hercules-25914bae30eced388cf8640eead19fbb11a65ade.tar.bz2 hercules-25914bae30eced388cf8640eead19fbb11a65ade.tar.xz hercules-25914bae30eced388cf8640eead19fbb11a65ade.zip | |
Revert "- Fixing battle->calc_cardfix applying target's cards twice on PvP/Cart Termination."
This reverts commit 5ed710e084608dbd9aaf3a9af1b12719a938ac43.
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 280867b0a..370adcd02 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) && !(left&2 )){ + }else if( tsd && !(nk&NK_NO_CARDFIX_DEF) ){ if( !(nk&NK_NO_ELEFIX) ) { int ele_fix = tsd->subele[s_ele]; |