From c9b58d1e0b6a39ea05e7bc96e0f4d8be5d40456b Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Wed, 5 Jan 2022 17:16:44 -0500
Subject: [PATCH] Core/Achievements: fixed bug with counting honorless units
 for achievement type ACHIEVEMENT_CRITERIA_TYPE_SPECIAL_PVP_KILL

Port From (https://github.com/TrinityCore/TrinityCore/commit/915d13020a723b2aaf9bf382974849fb906ed464)
---
 Source/Game/Entities/Player/KillRewarder.cs | 3 ---
 Source/Game/Entities/Player/Player.PvP.cs   | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Source/Game/Entities/Player/KillRewarder.cs b/Source/Game/Entities/Player/KillRewarder.cs
index 9349aebad..9832ba74a 100644
--- a/Source/Game/Entities/Player/KillRewarder.cs
+++ b/Source/Game/Entities/Player/KillRewarder.cs
@@ -269,10 +269,7 @@ namespace Game.Entities
                         {
                             // Killer may not be at reward distance, check directly
                             if (_killer == member || member.IsAtGroupRewardDistance(_victim))
-                            {
                                 _RewardPlayer(member, isDungeon);
-                                member.UpdateCriteria(CriteriaType.KillPlayer, 1, 0, 0, _victim);
-                            }
                         }
                     }
                 }
diff --git a/Source/Game/Entities/Player/Player.PvP.cs b/Source/Game/Entities/Player/Player.PvP.cs
index 1a7519a1a..825917b91 100644
--- a/Source/Game/Entities/Player/Player.PvP.cs
+++ b/Source/Game/Entities/Player/Player.PvP.cs
@@ -144,6 +144,7 @@ namespace Game.Entities
                     UpdateCriteria(CriteriaType.DeliverKillingBlowToRace, (uint)victim.GetRace());
                     UpdateCriteria(CriteriaType.PVPKillInArea, GetAreaId());
                     UpdateCriteria(CriteriaType.EarnHonorableKill, 1, 0, 0, victim);
+                    UpdateCriteria(CriteriaType.KillPlayer, 1, 0, 0, victim);
                 }
                 else
                 {