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

Core/Phasing: Fixed inverse phaseshift logic

Browse Source
This commit is contained in:
Shauren
2021-11-22 22:39:16 +01:00
parent cb8b637061
commit 630adfec22
4 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/server/game/Phasing/PhaseShift.cpp
View File

@@ -124,8 +124,8 @@ bool PhaseShift::CanSee(PhaseShift const& other) const
auto checkInversePhaseShift = [excludePhasesWithFlag](PhaseShift const& phaseShift, PhaseShift const& excludedPhaseShift)
{
if (phaseShift.Flags.HasFlag(PhaseShiftFlags::Unphased) && !excludedPhaseShift.Flags.HasFlag(PhaseShiftFlags::InverseUnphased))
return true;
if (phaseShift.Flags.HasFlag(PhaseShiftFlags::Unphased) && excludedPhaseShift.Flags.HasFlag(PhaseShiftFlags::InverseUnphased))
return false;
for (PhaseRef const& phase : phaseShift.Phases)
{
@@ -133,11 +133,10 @@ bool PhaseShift::CanSee(PhaseShift const& other) const
continue;
auto itr2 = std::find(excludedPhaseShift.Phases.begin(), excludedPhaseShift.Phases.end(), phase);
if (itr2 == excludedPhaseShift.Phases.end() || itr2->Flags.HasFlag(excludePhasesWithFlag))
return true;
if (itr2 != excludedPhaseShift.Phases.end() && !itr2->Flags.HasFlag(excludePhasesWithFlag))
return false;
}
return false;
return true;
};
if (other.Flags.HasFlag(PhaseShiftFlags::Inverse))