diff options
| author | malufett <malufett.eat.my.binaries@gmail.com> | 2014-02-10 18:11:32 +0800 |
|---|---|---|
| committer | malufett <malufett.eat.my.binaries@gmail.com> | 2014-02-10 18:11:32 +0800 |
| commit | 9b5bb9aa894d63d1d9f2cafa91f90bc4922bf414 (patch) | |
| tree | cba4c88a80d75d6609a328e6aec8726b6fa3d8b2 /src/map/battle.c | |
| parent | 4c735df7d013901c5fc79984bd2206d2109f53d8 (diff) | |
| download | hercules-9b5bb9aa894d63d1d9f2cafa91f90bc4922bf414.tar.gz hercules-9b5bb9aa894d63d1d9f2cafa91f90bc4922bf414.tar.bz2 hercules-9b5bb9aa894d63d1d9f2cafa91f90bc4922bf414.tar.xz hercules-9b5bb9aa894d63d1d9f2cafa91f90bc4922bf414.zip | |
Fixed Bug#7988
-http://hercules.ws/board/tracker/issue-7988-royal-guard-exceed-break-causes-map-server-crash/
Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index c57ff950e..e56e3d12d 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -4576,6 +4576,10 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list ATK_ADD( 30 * tsc->data[SC_DARKCROW]->val1 ); } + if ( sc && !skill_id && sc->data[SC_EXEEDBREAK] ) { + ATK_ADDRATE(sc->data[SC_EXEEDBREAK]->val1); + status_change_end(src, SC_EXEEDBREAK, INVALID_TIMER); + } #ifdef RENEWAL if( sd && skill_id == NJ_KUNAI ){ flag.tdef = 1; @@ -5599,10 +5603,6 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t wd = battle->calc_attack(BF_WEAPON, src, target, 0, 0, flag); if( sc && sc->count ) { - if (sc->data[SC_EXEEDBREAK]) { - ATK_RATER(sc->data[SC_EXEEDBREAK]->val1); - status_change_end(src, SC_EXEEDBREAK, INVALID_TIMER); - } if( sc->data[SC_SPELLFIST] ) { if( --(sc->data[SC_SPELLFIST]->val1) >= 0 ){ struct Damage ad = battle->calc_attack(BF_MAGIC,src,target,sc->data[SC_SPELLFIST]->val3,sc->data[SC_SPELLFIST]->val4,flag|BF_SHORT); |