From 4f68d0c144603aebbacbb4748fcbde6e83fd4262 Mon Sep 17 00:00:00 2001 From: Aleos Date: Thu, 28 May 2020 13:22:31 -0400 Subject: [PATCH] Fixes Mercenary kill counter (#5010) * Fixes #4329. * The master or the Mercenary are able to increase the kill count. Thanks to @Indigo000! --- src/map/mob.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/map/mob.cpp b/src/map/mob.cpp index 2d0420bfba..56c914c67e 100644 --- a/src/map/mob.cpp +++ b/src/map/mob.cpp @@ -3009,7 +3009,8 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) if (achievement_db.mobexists(md->mob_id)) achievement_update_objective(sd, AG_BATTLE, 1, md->mob_id); - if (sd->md && src && src->type == BL_MER && mob_db(md->mob_id)->lv > sd->status.base_level / 2) + // The master or Mercenary can increase the kill count + if (sd->md && src && (src->type == BL_PC || src->type == BL_MER) && mob_db(md->mob_id)->lv > sd->status.base_level / 2) mercenary_kills(sd->md); }