diff options
| author | Haruna <haru@dotalux.com> | 2015-09-29 10:20:05 +0200 |
|---|---|---|
| committer | Haruna <haru@dotalux.com> | 2015-09-29 10:20:05 +0200 |
| commit | d52dde700d0f1a598ebea87844007ff610352114 (patch) | |
| tree | 963aabe2a98f21fb310762478e059cfdedd9ca85 /src | |
| parent | 2b3298970e1d3784c8244458b1324623b3d03da5 (diff) | |
| parent | 2579216ce944438e4395f4d0c4ecf883385ba555 (diff) | |
| download | hercules-d52dde700d0f1a598ebea87844007ff610352114.tar.gz hercules-d52dde700d0f1a598ebea87844007ff610352114.tar.bz2 hercules-d52dde700d0f1a598ebea87844007ff610352114.tar.xz hercules-d52dde700d0f1a598ebea87844007ff610352114.zip | |
Merge pull request #756 from Nihadm89/patch-1
Fixes Maelstrom crashing server
Diffstat (limited to 'src')
| -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 e2f85e988..5b147de9c 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2814,7 +2814,7 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam } if( sc->data[SC__MAELSTROM] && (flag&BF_MAGIC) && skill_id && (skill->get_inf(skill_id)&INF_GROUND_SKILL) ) { // {(Maelstrom Skill LevelxAbsorbed Skill Level)+(Caster's Job/5)}/2 - int sp = (sc->data[SC__MAELSTROM]->val1 * skill_lv + sd->status.job_level / 5) / 2; + int sp = (sc->data[SC__MAELSTROM]->val1 * skill_lv + (sd ? sd->status.job_level / 5 : 0)) / 2; status->heal(bl, 0, sp, 3); d->dmg_lv = ATK_BLOCK; return 0; |