summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorParadox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-11-10 04:05:59 +0000
committerParadox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-11-10 04:05:59 +0000
commit9288b397b39c214b268f17769f2203657928b815 (patch)
treeb139ad8c87d53b377240fb5d7f5f0f83db56a006 /src/map
parent789a46f94b3ee7dff3252dd184ac7d7b2307e413 (diff)
downloadhercules-9288b397b39c214b268f17769f2203657928b815.tar.gz
hercules-9288b397b39c214b268f17769f2203657928b815.tar.bz2
hercules-9288b397b39c214b268f17769f2203657928b815.tar.xz
hercules-9288b397b39c214b268f17769f2203657928b815.zip
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)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13367 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/mob.c2
1 files changed, 1 insertions, 1 deletions
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 )