Skip to content

Spell: Fix Arcing Sear (and other TARGET_UNIT_ENEMY_NEAR_CASTER spells) #846

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
insunaa wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −6
Open

Spell: Fix Arcing Sear (and other TARGET_UNIT_ENEMY_NEAR_CASTER spells) #846

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/game/Spells/Spell.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5245,7 +5245,7 @@ SpellCastResult Spell::CheckCast(bool strict)
if (Creature const* targetCreature = dynamic_cast<Creature*>(target))
if ((!targetCreature->GetLootRecipientGuid().IsEmpty()) && !targetCreature->IsTappedBy(static_cast<Player*>(m_trueCaster)))
return SPELL_FAILED_CANT_CAST_ON_TAPPED;

// Do not allow spells to complete which are targeting players that are invisible to the caster since the time of cast start
if (!m_trueCaster->IsGameObject() && target->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED) && !IsPositiveEffectMask(m_spellInfo, affectedMask, m_trueCaster, target) && !target->IsVisibleForOrDetect(m_caster, m_trueCaster, false, false, true, false, m_spellInfo->HasAttribute(SPELL_ATTR_EX6_IGNORE_PHASE_SHIFT)))
return SPELL_FAILED_BAD_TARGETS;
Expand Down Expand Up @@ -5608,7 +5608,7 @@ SpellCastResult Spell::CheckCast(bool strict)
break;
}
}

if (inCombat)
return SPELL_FAILED_TARGET_IN_COMBAT;
}
Expand Down Expand Up @@ -7511,10 +7511,10 @@ bool Spell::CheckTarget(Unit* target, SpellEffectIndex eff, bool targetB, bool n
{
if (target->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNTARGETABLE))
return false;

if (m_spellInfo->HasAttribute(SPELL_ATTR_EX_ONLY_PEACEFUL_TARGETS) && target->IsInCombat())
return false;
}
}

if (m_spellInfo->HasAttribute(SPELL_ATTR_EX3_NOT_ON_AOE_IMMUNE) || m_spellInfo->HasAttribute(SPELL_ATTR_EX5_TREAT_AS_AREA_EFFECT)) // rest done in aoe code
if (target->IsAOEImmune())
Expand Down Expand Up @@ -7855,7 +7855,7 @@ float Spell::GetSpellSpeed() const

if (m_overrideSpeed)
return m_overridenSpeed;

return m_spellInfo->speed;
}

Expand Down Expand Up @@ -8222,8 +8222,10 @@ void Spell::FilterTargetMap(UnitList& filterUnitList, SpellTargetFilterScheme sc
case SCHEME_CLOSEST_CHAIN:
{
Unit* unitTarget = m_targets.getUnitTarget();
if (filterUnitList.empty() || filterUnitList.front() != unitTarget)
if (filterUnitList.empty())
break;
if (!unitTarget)
unitTarget = filterUnitList.front();
UnitList newList;
newList.push_back(unitTarget);
filterUnitList.pop_front();
Expand Down