fix(Core/Spells): Fixed calculating LoS for dynamic objects. (#13521)

Fixes #13255
This commit is contained in:
UltraNix
2022-10-29 12:12:49 +02:00
committed by GitHub
parent 41d3df9fcb
commit 0cd6319cfc

View File

@@ -2923,15 +2923,18 @@ void DynObjAura::FillTargetMap(std::map<Unit*, uint8>& targets, Unit* /*caster*/
for (UnitList::iterator itr = targetList.begin(); itr != targetList.end(); ++itr) for (UnitList::iterator itr = targetList.begin(); itr != targetList.end(); ++itr)
{ {
// xinef: check z level and los dependence
Unit* target = *itr; Unit* target = *itr;
float zLevel = GetDynobjOwner()->GetPositionZ();
if (target->GetPositionZ() + 3.0f < zLevel || target->GetPositionZ() - 5.0f > zLevel) Optional<float> collisionHeight = { };
if (Unit* dynObjCaster = GetDynobjOwner()->GetCaster())
{ {
if (!spellInfo->HasAttribute(SPELL_ATTR2_IGNORE_LINE_OF_SIGHT) && !spellInfo->HasAttribute(SPELL_ATTR5_ALWAYS_AOE_LINE_OF_SIGHT) && !target->IsWithinLOSInMap(GetDynobjOwner())) collisionHeight = dynObjCaster->GetCollisionHeight();
{ }
continue;
} if (!spellInfo->HasAttribute(SPELL_ATTR2_IGNORE_LINE_OF_SIGHT) && !spellInfo->HasAttribute(SPELL_ATTR5_ALWAYS_AOE_LINE_OF_SIGHT) &&
!target->IsWithinLOSInMap(GetDynobjOwner(), VMAP::ModelIgnoreFlags::Nothing, LINEOFSIGHT_ALL_CHECKS, collisionHeight))
{
continue;
} }
std::map<Unit*, uint8>::iterator existing = targets.find(*itr); std::map<Unit*, uint8>::iterator existing = targets.find(*itr);