Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Napster 2016-01-11 22:47:06 +07:00
commit 2debd47b6b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/map/script.c
View File

@ -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_LUK: md->status.luk = (unsigned short)value; status_calc_misc(bl, &md->status, md->level); break;
case UMOB_SLAVECPYMSTRMD: case UMOB_SLAVECPYMSTRMD:
if (value > 0) { 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"); ShowWarning("buildin_setunitdata: Trying to set UMOB_SLAVECPYMSTRMD on mob without master!\n");
break; break;
} }
TBL_MOB *md2 = map_id2md(md->master_id);
md->status.mode = md2->status.mode; md->status.mode = md2->status.mode;
md->state.copy_master_mode = 1; md->state.copy_master_mode = 1;
} else } else

2
src/map/skill.c
View File

@ -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); dmg.dmotion = clif_skill_damage(src,bl,tick,dmg.amotion,dmg.dmotion,damage,dmg.div_,skill_id,skill_lv,8);
break; break;
case WL_CHAINLIGHTNING_ATK: 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; break;
case LG_OVERBRAND: case LG_OVERBRAND:
case LG_OVERBRAND_BRANDISH: case LG_OVERBRAND_BRANDISH: