From 49699bc966e4543044da7f1fd75d57fbebfac4e4 Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 2 Dec 2024 15:24:36 +0100 Subject: Core/Quests: Change Player::KilledMonster arguments to take Creature directly --- src/server/game/Entities/Player/KillRewarder.cpp | 2 +- src/server/game/Entities/Player/Player.cpp | 9 +++++---- src/server/game/Entities/Player/Player.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Entities/Player/KillRewarder.cpp b/src/server/game/Entities/Player/KillRewarder.cpp index aaabd7b90dd..99d57edb1a3 100644 --- a/src/server/game/Entities/Player/KillRewarder.cpp +++ b/src/server/game/Entities/Player/KillRewarder.cpp @@ -183,7 +183,7 @@ inline void KillRewarder::_RewardKillCredit(Player* player) { if (Creature* target = _victim->ToCreature()) { - player->KilledMonster(target->GetCreatureTemplate(), target->GetGUID()); + player->KilledMonster(target); player->UpdateCriteria(CriteriaType::KillAnyCreature, target->GetCreatureType(), 1, 0, target); } } diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 9324fbc2a8f..25f907599ec 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -16655,12 +16655,13 @@ void Player::ItemRemovedQuestCheck(uint32 entry, uint32 /*count*/) UpdateVisibleObjectInteractions(true, false, false, true); } -void Player::KilledMonster(CreatureTemplate const* cInfo, ObjectGuid guid) +void Player::KilledMonster(Creature const* creature) { - ASSERT(cInfo); + ASSERT(creature); - if (cInfo->Entry) - KilledMonsterCredit(cInfo->Entry, guid); + CreatureTemplate const* cInfo = creature->GetCreatureTemplate(); + + KilledMonsterCredit(cInfo->Entry, creature->GetGUID()); for (uint8 i = 0; i < MAX_KILL_CREDIT; ++i) if (cInfo->KillCredit[i]) diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 5d30370d10a..5ad1ba76f11 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1715,7 +1715,7 @@ class TC_GAME_API Player final : public Unit, public GridObject void GroupEventHappens(uint32 questId, WorldObject const* pEventObject); void ItemAddedQuestCheck(uint32 entry, uint32 count, Optional boundItemFlagRequirement = {}, bool* hadBoundItemObjective = nullptr); void ItemRemovedQuestCheck(uint32 entry, uint32 count); - void KilledMonster(CreatureTemplate const* cInfo, ObjectGuid guid); + void KilledMonster(Creature const* creature); void KilledMonsterCredit(uint32 entry, ObjectGuid guid = ObjectGuid::Empty); void KilledPlayerCredit(ObjectGuid victimGuid); void KillCreditGO(uint32 entry, ObjectGuid guid = ObjectGuid::Empty); -- cgit v1.2.3