From 2579216ce944438e4395f4d0c4ecf883385ba555 Mon Sep 17 00:00:00 2001
From: Nihadm89 <nihadm89@hotmail.com>
Date: Mon, 28 Sep 2015 23:44:46 +0200
Subject: Fixes Maelstrom crashing server

Bug Report: https://github.com/HerculesWS/Hercules/issues/731
---
 src/map/battle.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/map/battle.c')

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;
-- 
cgit v1.2.3-70-g09d2