From e130290f832ae4592efc765ef0ddfc92ba8d6c43 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 15 Mar 2025 07:00:38 +0100 Subject: [PATCH] Core/Creatures: Implemented CREATURE_STATIC_FLAG_3_NO_THREAT_FEEDBACK --- src/server/game/Combat/ThreatManager.cpp | 9 +++++++++ src/server/game/Entities/Creature/Creature.h | 3 +++ 2 files changed, 12 insertions(+) diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp index 265dc8cd41..f7e0bc31bf 100644 --- a/src/server/game/Combat/ThreatManager.cpp +++ b/src/server/game/Combat/ThreatManager.cpp @@ -819,6 +819,9 @@ void ThreatManager::UnregisterRedirectThreat(uint32 spellId, ObjectGuid const& v void ThreatManager::SendClearAllThreatToClients() const { + if (Creature const* owner = _owner->ToCreature(); owner && owner->IsThreatFeedbackDisabled()) + return; + WorldPackets::Combat::ThreatClear packet; packet.UnitGUID = _owner->GetGUID(); _owner->SendMessageToSet(packet.Write(), false); @@ -826,6 +829,9 @@ void ThreatManager::SendClearAllThreatToClients() const void ThreatManager::SendRemoveToClients(Unit const* victim) const { + if (Creature const* owner = _owner->ToCreature(); owner && owner->IsThreatFeedbackDisabled()) + return; + WorldPackets::Combat::ThreatRemove packet; packet.UnitGUID = _owner->GetGUID(); packet.AboutGUID = victim->GetGUID(); @@ -834,6 +840,9 @@ void ThreatManager::SendRemoveToClients(Unit const* victim) const void ThreatManager::SendThreatListToClients(bool newHighest) const { + if (Creature const* owner = _owner->ToCreature(); owner && owner->IsThreatFeedbackDisabled()) + return; + auto fillSharedPacketDataAndSend = [&](auto& packet) { packet.UnitGUID = _owner->GetGUID(); diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index ee73df01db..d002c3c688 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -393,6 +393,9 @@ class TC_GAME_API Creature : public Unit, public GridObject, public Ma void AtEngage(Unit* target) override; void AtDisengage() override; + bool IsThreatFeedbackDisabled() const { return _staticFlags.HasFlag(CREATURE_STATIC_FLAG_3_NO_THREAT_FEEDBACK); } + void SetNoThreatFeedback(bool noThreatFeedback) { _staticFlags.ApplyFlag(CREATURE_STATIC_FLAG_3_NO_THREAT_FEEDBACK, noThreatFeedback); } + void ForcePartyMembersIntoCombat(); bool HasStaticFlag(CreatureStaticFlags flag) const { return _staticFlags.HasFlag(flag); }