diff options
Diffstat (limited to 'src/map/mob.c')
| -rw-r--r-- | src/map/mob.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map/mob.c b/src/map/mob.c index 6d340b14a..309b47000 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -1942,8 +1942,6 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) } pc_setglobalreg(sd,"TK_MISSION_COUNT", sd->mission_count); } - if( sd->md && (md->level > sd->status.base_level / 2) ) - mercenary_kills(sd->md); } // filter out entries not eligible for exp distribution @@ -2324,8 +2322,12 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) { case BL_PET: sd = ((TBL_PET*)src)->msd; break; case BL_HOM: sd = ((TBL_HOM*)src)->master; break; + case BL_MER: sd = ((TBL_MER*)src)->master; break; } + if( sd && sd->md && src && src->type != BL_HOM ) + mercenary_kills(sd->md); + if( md->npc_event[0] && !md->state.npc_killmonster ) { if( sd && battle_config.mob_npc_event_type ) |