Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 09:17:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Threat: Suppressed threat is now re-evaluated on taunt state update, and taunting units can no longer be suppressed.

Browse Source
This commit is contained in:
Treeston
2018-09-08 23:51:50 +02:00
committed by Ovahlord
parent 471efa832c
commit 2eacac1b4d
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/server/game/Combat/ThreatManager.cpp
View File

@@ -106,6 +106,8 @@ bool ThreatReference::ShouldBeOffline() const
bool ThreatReference::ShouldBeSuppressed() const
{
if (IsTaunting()) // a taunting victim can never be suppressed
return false;
if (_victim->IsImmunedToDamage(_owner->GetMeleeDamageSchoolMask()))
return true;
if (_victim->HasAuraType(SPELL_AURA_MOD_CONFUSE))
@@ -272,11 +274,22 @@ bool ThreatManager::IsThreateningTo(ObjectGuid const& who, bool includeOffline)
}
bool ThreatManager::IsThreateningTo(Unit const* who, bool includeOffline) const { return IsThreateningTo(who->GetGUID(), includeOffline); }
void ThreatManager::EvaluateSuppressed()
void ThreatManager::EvaluateSuppressed(bool canExpire)
{
for (auto const& pair : _threatenedByMe)
if (pair.second->IsOnline() && pair.second->ShouldBeSuppressed())
{
bool const shouldBeSuppressed = pair.second->ShouldBeSuppressed();
if (pair.second->IsOnline() && shouldBeSuppressed)
{
pair.second->_online = ThreatReference::ONLINE_STATE_SUPPRESSED;
pair.second->HeapNotifyDecreased();
}
else if (canExpire && pair.second->IsSuppressed() && !shouldBeSuppressed)
{
pair.second->_online = ThreatReference::ONLINE_STATE_ONLINE;
pair.second->HeapNotifyIncreased();
}
}
}
static void SaveCreatureHomePositionIfNeed(Creature* c)
@@ -362,10 +375,13 @@ void ThreatManager::AddThreat(Unit* target, float amount, SpellInfo const* spell
if (it != _myThreatListEntries.end())
{
ThreatReference* const ref = it->second;
// causing threat causes SUPPRESSED threat states to stop being suppressed
// SUPPRESSED threat states don't go back to ONLINE until threat is caused by them (retail behavior)
if (ref->GetOnlineState() == ThreatReference::ONLINE_STATE_SUPPRESSED)
if (!ref->ShouldBeSuppressed())
{
ref->_online = ThreatReference::ONLINE_STATE_ONLINE;
ref->HeapNotifyIncreased();
}
if (ref->IsOnline())
ref->AddThreat(amount);
@@ -436,6 +452,9 @@ void ThreatManager::TauntUpdate()
else
pair.second->UpdateTauntState();
}
// taunt aura update also re-evaluates all suppressed states (retail behavior)
EvaluateSuppressed(true);
}
void ThreatManager::ResetAllThreat()

3
src/server/game/Combat/ThreatManager.h
View File

@@ -141,7 +141,7 @@ class TC_GAME_API ThreatManager
auto const& GetThreatenedByMeList() const { return _threatenedByMe; }
// Notify the ThreatManager that its owner may now be suppressed on others' threat lists (immunity or damage-breakable CC being applied)
void EvaluateSuppressed();
void EvaluateSuppressed(bool canExpire = false);
///== AFFECT MY THREAT LIST ==
void AddThreat(Unit* target, float amount, SpellInfo const* spell = nullptr, bool ignoreModifiers = false, bool ignoreRedirects = false);
void ScaleThreat(Unit* target, float factor);
@@ -262,6 +262,7 @@ class TC_GAME_API ThreatReference
OnlineState GetOnlineState() const { return _online; }
bool IsOnline() const { return (_online >= ONLINE_STATE_ONLINE); }
bool IsAvailable() const { return (_online > ONLINE_STATE_OFFLINE); }
bool IsSuppressed() const { return (_online == ONLINE_STATE_SUPPRESSED); }
bool IsOffline() const { return (_online <= ONLINE_STATE_OFFLINE); }
TauntState GetTauntState() const { return IsTaunting() ? TAUNT_STATE_TAUNT : _taunted; }
bool IsTaunting() const { return _taunted >= TAUNT_STATE_TAUNT; }