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

Don't set the md->state.copy_master_mode if master_id check fails.

Browse Source
This commit is contained in:
Jittapan Pluemsumran 2016-01-09 01:51:04 +07:00
parent f2bad5e832
commit 08e26c9de9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/map/script.c
View File

@ -17173,7 +17173,6 @@ BUILDIN_FUNC(setunitdata)
case UMOB_DEX: md->status.dex = (unsigned short)value; status_calc_misc(bl, &md->status, md->level); break; case UMOB_DEX: md->status.dex = (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_LUK: md->status.luk = (unsigned short)value; status_calc_misc(bl, &md->status, md->level); break;
case UMOB_SLAVECPYMSTRMD: case UMOB_SLAVECPYMSTRMD:
md->state.copy_master_mode = value > 0 ? 1 : 0;
if (value > 0) { if (value > 0) {
if (!md->master_id) { if (!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");
@ -17181,7 +17180,9 @@ BUILDIN_FUNC(setunitdata)
} }
TBL_MOB *md2 = map_id2md(md->master_id); 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;
} else
md->state.copy_master_mode = 0;
break; break;
case UMOB_DMGIMMUNE: md->ud.immune_attack = (bool)value > 0 ? 1 : 0; break; case UMOB_DMGIMMUNE: md->ud.immune_attack = (bool)value > 0 ? 1 : 0; break;
case UMOB_ATKRANGE: md->status.rhw.range = (unsigned short)value; break; case UMOB_ATKRANGE: md->status.rhw.range = (unsigned short)value; break;