aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Combat/ThreatManager.h
diff options
context:
space:
mode:
authorTreeston <treeston.mmoc@gmail.com>2018-09-09 14:47:49 +0200
committerShauren <shauren.trinity@gmail.com>2021-10-26 23:51:34 +0200
commit35e53839291c3782acca46d2f88f84b86d6e15b1 (patch)
tree13a32483dbc23c640e9083b990ab5857c8675333 /src/server/game/Combat/ThreatManager.h
parent26ca7b0fc2907f861d2cdbf1e8699b364518501b (diff)
Core/Threat: Properly sequence checking offline state _after_ adding the reference to the threat list. This ensures IsEngagedWith reports consistent values for downstack calls in Creature. Closes #22406.
(cherry picked from commit 9f1755dbf13d475a26741690ec5d6a340a7f4230)
Diffstat (limited to 'src/server/game/Combat/ThreatManager.h')
-rw-r--r--src/server/game/Combat/ThreatManager.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Combat/ThreatManager.h b/src/server/game/Combat/ThreatManager.h
index eca5f45c804..decd9d0a26b 100644
--- a/src/server/game/Combat/ThreatManager.h
+++ b/src/server/game/Combat/ThreatManager.h
@@ -278,10 +278,10 @@ class TC_GAME_API ThreatReference
private:
static bool FlagsAllowFighting(Unit const* a, Unit const* b);
- ThreatReference(ThreatManager* mgr, Unit* victim, float amount) :
+ ThreatReference(ThreatManager* mgr, Unit* victim) :
_owner(reinterpret_cast<Creature*>(mgr->_owner)), _mgr(*mgr), _victim(victim),
- _online(ShouldBeOffline() ? ONLINE_STATE_OFFLINE : ShouldBeSuppressed() ? ONLINE_STATE_SUPPRESSED : ONLINE_STATE_ONLINE),
- _baseAmount(IsOnline() ? amount : 0.0f), _tempModifier(0), _taunted(TAUNT_STATE_NONE) { }
+ _online(ShouldBeSuppressed() ? ONLINE_STATE_SUPPRESSED : ONLINE_STATE_ONLINE),
+ _baseAmount(0.0f), _tempModifier(0), _taunted(TAUNT_STATE_NONE) { }
void UnregisterAndFree();