diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2018-09-08 23:51:50 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-10-25 14:17:14 +0200 |
| commit | c323758631fe5e414e7e2bb002b5ba89aa449834 (patch) | |
| tree | c4ea8d20d8b6e11c9961e7bf81fac77de35518aa /src/server/game/Combat/ThreatManager.h | |
| parent | 33c8df9cf17e6febc43105daa1abcb3843b9405f (diff) | |
Core/Threat: Suppressed threat is now re-evaluated on taunt state update, and taunting units can no longer be suppressed.
(cherry picked from commit fdbec8b6398295e75e38bd174318d5e172124905)
Diffstat (limited to 'src/server/game/Combat/ThreatManager.h')
| -rw-r--r-- | src/server/game/Combat/ThreatManager.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Combat/ThreatManager.h b/src/server/game/Combat/ThreatManager.h index defb4a1b94e..eca5f45c804 100644 --- a/src/server/game/Combat/ThreatManager.h +++ b/src/server/game/Combat/ThreatManager.h @@ -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; } |