From 5702dc3c852a07904a3279de15ae6a77b4e76897 Mon Sep 17 00:00:00 2001 From: Aleos Date: Mon, 22 Jul 2019 08:40:49 -0400 Subject: [PATCH] Corrected another potential crash with Joint Beat (#4255) * Follow up to cb2c553. Thanks to @teededung! --- src/map/skill.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/map/skill.cpp b/src/map/skill.cpp index a5dd47ed1b..468510369c 100755 --- a/src/map/skill.cpp +++ b/src/map/skill.cpp @@ -4773,7 +4773,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint case LK_JOINTBEAT: flag = 1 << rnd() % 6; - if (flag != BREAK_NECK && tsc && tsc->data[SC_JOINTBEAT]->val2 & BREAK_NECK) + if (flag != BREAK_NECK && tsc && tsc->data[SC_JOINTBEAT] && tsc->data[SC_JOINTBEAT]->val2 & BREAK_NECK) flag = BREAK_NECK; // Target should always receive double damage if neck is already broken if (skill_attack(BF_WEAPON, src, src, bl, skill_id, skill_lv, tick, flag)) sc_start4(src, bl, SC_JOINTBEAT, 50 + (skill_lv + 1), skill_lv, flag&BREAK_FLAGS, src->id, 0, skill_get_time2(skill_id, skill_lv));