diff options
| author | Matias <matiassw@gmail.com> | 2013-06-25 02:23:22 -0400 |
|---|---|---|
| committer | Matias <matiassw@gmail.com> | 2013-06-25 02:23:22 -0400 |
| commit | 5ed710e084608dbd9aaf3a9af1b12719a938ac43 (patch) | |
| tree | 954446f649748b9f97b754dc67c17633b48fe2e0 | |
| parent | c1dbdcbe3edee8ecdf259ea77f26ae02338a0903 (diff) | |
| download | hercules-5ed710e084608dbd9aaf3a9af1b12719a938ac43.tar.gz hercules-5ed710e084608dbd9aaf3a9af1b12719a938ac43.tar.bz2 hercules-5ed710e084608dbd9aaf3a9af1b12719a938ac43.tar.xz hercules-5ed710e084608dbd9aaf3a9af1b12719a938ac43.zip | |
- Fixing battle->calc_cardfix applying target's cards twice on PvP/Cart Termination.
| -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 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]; |