summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorNihadm89 <nihadm89@hotmail.com>2015-09-28 23:44:46 +0200
committerNihadm89 <nihadm89@hotmail.com>2015-09-28 23:44:46 +0200
commit2579216ce944438e4395f4d0c4ecf883385ba555 (patch)
tree9bb6665ae28990b61564d9418ccca65569603e33 /src/map
parent99af454e850979b94bd3fb7dc87ad2b9d9e327f1 (diff)
downloadhercules-2579216ce944438e4395f4d0c4ecf883385ba555.tar.gz
hercules-2579216ce944438e4395f4d0c4ecf883385ba555.tar.bz2
hercules-2579216ce944438e4395f4d0c4ecf883385ba555.tar.xz
hercules-2579216ce944438e4395f4d0c4ecf883385ba555.zip
Fixes Maelstrom crashing server
Bug Report: https://github.com/HerculesWS/Hercules/issues/731
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battle.c2
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;