diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2018-01-22 23:55:33 -0300 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-06-16 21:26:57 +0200 |
| commit | d0f4310c4417fb5dc8e89061adf4ce113caa4227 (patch) | |
| tree | 311575f8d3d004140628d0f47f06539538d51112 /src/server/game/Spells/Spell.cpp | |
| parent | c77925da4a320df5be5eaeb1fc799df50e22c041 (diff) | |
Core/Entities: don't allow client control if player is still affected by any lose of control state
(cherry picked from commit e315e41d36061fc88dfa09bfa0da1fbc0c00826f)
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 58a81a6795e..cfde52ec4d6 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -3202,11 +3202,11 @@ void Spell::_cast(bool skipCheck) // Let any pets know we've attacked something. Check DmgClass for harmful spells only // This prevents spells such as Hunter's Mark from triggering pet attack if (GetSpellInfo()->DmgClass != SPELL_DAMAGE_CLASS_NONE) - if (Unit* unitTarget = m_targets.GetUnitTarget()) + if (Unit* target = m_targets.GetUnitTarget()) for (Unit* controlled : playerCaster->m_Controlled) if (Creature* cControlled = controlled->ToCreature()) if (cControlled->IsAIEnabled) - cControlled->AI()->OwnerAttacked(unitTarget); + cControlled->AI()->OwnerAttacked(target); } SetExecutedCurrently(true); @@ -3278,7 +3278,7 @@ void Spell::_cast(bool skipCheck) if (aura_effmask) { - if (DiminishingGroup diminishGroup = m_spellInfo->GetDiminishingReturnsGroupForSpell()) + if (m_spellInfo->GetDiminishingReturnsGroupForSpell()) { DiminishingReturnsType type = m_spellInfo->GetDiminishingReturnsGroupType(); if (type == DRTYPE_ALL || (type == DRTYPE_PLAYER && target->IsAffectedByDiminishingReturns())) |