diff options
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/mob.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 8e036e59b..fa5d713db 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,8 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +2008/11/09 + * Added a check to make sure killed monster's level was greater than half of the mercenary owner's level before incrementing mercenary's killcount. (bugreport:2410) [Paradox924X] 2008/11/07 * Rev. 13358 Changed how mobcount works since it wasn't counting last mob death. (bugreport:2419) [L0ne_W0lf] 2008/11/06 diff --git a/src/map/mob.c b/src/map/mob.c index 9e734926a..1daeda3b0 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -2324,7 +2324,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) case BL_MER: sd = ((TBL_MER*)src)->master; break; } - if( sd && sd->md && src && src->type != BL_HOM ) + if( sd && sd->md && src && src->type != BL_HOM && mob_db(md->class_)->lv > sd->status.base_level/2 ) mercenary_kills(sd->md); if( md->npc_event[0] && !md->state.npc_killmonster ) |