From 10787838dcca4179038fdaf4087a2a20f1c8e365 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Tue, 11 May 2021 13:00:12 -0400 Subject: [PATCH] Core/Quests: Implemented QUEST_OBJECTIVE_FLAG_KILL_PLAYERS_SAME_FACTION Port From (https://github.com/TrinityCore/TrinityCore/commit/2ffedf30a9f177ba848bb74c1b41375ac6d734a9) --- Source/Game/Entities/Player/KillRewarder.cs | 2 +- Source/Game/Entities/Player/Player.Quest.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Game/Entities/Player/KillRewarder.cs b/Source/Game/Entities/Player/KillRewarder.cs index 8c7e8b467..9e93c9436 100644 --- a/Source/Game/Entities/Player/KillRewarder.cs +++ b/Source/Game/Entities/Player/KillRewarder.cs @@ -222,7 +222,7 @@ namespace Game.Entities _RewardHonor(player); // 4.1.1 Send player killcredit for quests with PlayerSlain if (_victim.IsTypeId(TypeId.Player)) - player.KilledPlayerCredit(); + player.KilledPlayerCredit(_victim.GetGUID()); } // Give XP only in PvE or in Battlegrounds. // Give reputation and kill credit only in PvE. diff --git a/Source/Game/Entities/Player/Player.Quest.cs b/Source/Game/Entities/Player/Player.Quest.cs index 96c831c59..a9e5bb1f9 100644 --- a/Source/Game/Entities/Player/Player.Quest.cs +++ b/Source/Game/Entities/Player/Player.Quest.cs @@ -2229,9 +2229,9 @@ namespace Game.Entities UpdateQuestObjectiveProgress(QuestObjectiveType.Monster, (int)entry, 1, guid); } - public void KilledPlayerCredit() + public void KilledPlayerCredit(ObjectGuid victimGuid) { - UpdateQuestObjectiveProgress(QuestObjectiveType.PlayerKills, 0, 1); + UpdateQuestObjectiveProgress(QuestObjectiveType.PlayerKills, 0, 1, victimGuid); } public void KillCreditGO(uint entry, ObjectGuid guid = default)