From 3a2439ba15340ddf38ea254a421273d09b56334d Mon Sep 17 00:00:00 2001 From: Hondacrx Date: Sun, 23 Feb 2025 13:13:57 -0500 Subject: [PATCH] Core/Quests: Change Player::KilledMonster arguments to take Creature directly Port From (https://github.com/TrinityCore/TrinityCore/commit/49699bc966e4543044da7f1fd75d57fbebfac4e4) --- Source/Game/Entities/Player/KillRewarder.cs | 2 +- Source/Game/Entities/Player/Player.Quest.cs | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Source/Game/Entities/Player/KillRewarder.cs b/Source/Game/Entities/Player/KillRewarder.cs index 91f4be5a4..0ad6da0d0 100644 --- a/Source/Game/Entities/Player/KillRewarder.cs +++ b/Source/Game/Entities/Player/KillRewarder.cs @@ -199,7 +199,7 @@ namespace Game.Entities Creature target = _victim.ToCreature(); if (target != null) { - player.KilledMonster(target.GetCreatureTemplate(), target.GetGUID()); + player.KilledMonster(target); player.UpdateCriteria(CriteriaType.KillAnyCreature, (ulong)target.GetCreatureType(), 1, 0, target); } } diff --git a/Source/Game/Entities/Player/Player.Quest.cs b/Source/Game/Entities/Player/Player.Quest.cs index 59bbce734..32414eb78 100644 --- a/Source/Game/Entities/Player/Player.Quest.cs +++ b/Source/Game/Entities/Player/Player.Quest.cs @@ -2528,12 +2528,13 @@ namespace Game.Entities UpdateVisibleObjectInteractions(true, false, false, true); } - public void KilledMonster(CreatureTemplate cInfo, ObjectGuid guid) + public void KilledMonster(Creature creature) { - Cypher.Assert(cInfo != null); + Cypher.Assert(creature != null); - if (cInfo.Entry != 0) - KilledMonsterCredit(cInfo.Entry, guid); + CreatureTemplate cInfo = creature.GetCreatureTemplate(); + + KilledMonsterCredit(cInfo.Entry, creature.GetGUID()); for (byte i = 0; i < 2; ++i) if (cInfo.KillCredit[i] != 0)