Merge branch 'master' of https://github.com/rathena/rathena

src/map/script.c

@@ -17174,11 +17174,11 @@ BUILDIN_FUNC(setunitdata)
 			case UMOB_LUK: md->status.luk = (unsigned short)value; status_calc_misc(bl, &md->status, md->level); break;
 			case UMOB_SLAVECPYMSTRMD:
 				if (value > 0) {
-					if (!md->master_id) {
+					TBL_MOB *md2 = NULL;
+					if (!md->master_id || !(md2 = map_id2md(md->master_id))) {
 						ShowWarning("buildin_setunitdata: Trying to set UMOB_SLAVECPYMSTRMD on mob without master!\n");
 						break;
 					}
-					TBL_MOB *md2 = map_id2md(md->master_id);
 					md->status.mode = md2->status.mode;
 					md->state.copy_master_mode = 1;
 				} else

src/map/skill.c

@@ -3227,7 +3227,7 @@ int64 skill_attack (int attack_type, struct block_list* src, struct block_list *
 			dmg.dmotion = clif_skill_damage(src,bl,tick,dmg.amotion,dmg.dmotion,damage,dmg.div_,skill_id,skill_lv,8);
 			break;
 		case WL_CHAINLIGHTNING_ATK:
-			dmg.dmotion = clif_skill_damage(src,bl,tick,dmg.amotion,dmg.dmotion,damage,1,WL_CHAINLIGHTNING,-2,6);
+			dmg.dmotion = clif_skill_damage(src,bl,tick,dmg.amotion,dmg.dmotion,damage,1,WL_CHAINLIGHTNING_ATK,-2,6);
 			break;
 		case LG_OVERBRAND:
 		case LG_OVERBRAND_BRANDISH: