diff options
author | Subv <subv2112@gmail.com> | 2014-06-01 22:27:29 -0500 |
---|---|---|
committer | Subv <subv2112@gmail.com> | 2014-06-01 22:27:29 -0500 |
commit | 48ec2df81fa8f88cd32d7a79b587603aedbd89e0 (patch) | |
tree | 1a6404c63979ee20a39f8b577db21541b37739c5 /src/server/game/Combat/ThreatManager.cpp | |
parent | 6bc62d730ed08e6e12d9b57d4914e98019298781 (diff) |
Core/Phases: Preliminary work with correctly implementing the phase system in 4.3.4
Put here for peer review.
Diffstat (limited to 'src/server/game/Combat/ThreatManager.cpp')
-rw-r--r-- | src/server/game/Combat/ThreatManager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp index 339ec579b1a..edf15aaf1ff 100644 --- a/src/server/game/Combat/ThreatManager.cpp +++ b/src/server/game/Combat/ThreatManager.cpp @@ -75,7 +75,7 @@ bool ThreatCalcHelper::isValidProcess(Unit* hatedUnit, Unit* hatingUnit, SpellIn return false; // not in same map or phase - if (!hatedUnit->IsInMap(hatingUnit) || !hatedUnit->InSamePhase(hatingUnit)) + if (!hatedUnit->IsInMap(hatingUnit) || !hatedUnit->IsInPhase(hatingUnit)) return false; // spell not causing threat @@ -182,7 +182,7 @@ void HostileReference::updateOnlineStatus() && (getTarget()->GetTypeId() != TYPEID_PLAYER || !getTarget()->ToPlayer()->IsGameMaster()) && !getTarget()->HasUnitState(UNIT_STATE_IN_FLIGHT) && getTarget()->IsInMap(GetSourceUnit()) - && getTarget()->InSamePhase(GetSourceUnit()) + && getTarget()->IsInPhase(GetSourceUnit()) ) { Creature* creature = GetSourceUnit()->ToCreature(); |