diff options
| author | Shauren <shauren.trinity@gmail.com> | 2021-10-03 14:58:35 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-10-03 14:58:35 +0200 |
| commit | 3af9be830d736506ed4544a922699ed0f7a7ecd4 (patch) | |
| tree | c334a35bfa68b5a1fc8a2549d0766e982fb82e5f /src/server/game/Spells/Spell.cpp | |
| parent | 4449b1396ca3bdea1d856bc991903358e33d2000 (diff) | |
Core/Spells: Removed CastSpellExtraArgs constructors accepting ObjectGuid, they would become ambiguous with future changes
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index cf324178003..7dde366b5bd 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -2961,7 +2961,8 @@ void Spell::DoTriggersOnSpellHit(Unit* unit, uint32 effMask) if (*i < 0) unit->RemoveAurasDueToSpell(-(*i)); else - unit->CastSpell(unit, *i, m_caster->GetGUID()); + unit->CastSpell(unit, *i, CastSpellExtraArgs(TRIGGERED_FULL_MASK) + .SetOriginalCaster(m_caster->GetGUID())); } } } @@ -5778,7 +5779,8 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint { if (strict) //starting cast, trigger pet stun (cast by pet so it doesn't attack player) if (Pet* pet = unitCaster->ToPlayer()->GetPet()) - pet->CastSpell(pet, 32752, pet->GetGUID()); + pet->CastSpell(pet, 32752, CastSpellExtraArgs(TRIGGERED_FULL_MASK) + .SetOriginalCaster(pet->GetGUID())); } else if (!m_spellInfo->HasAttribute(SPELL_ATTR1_DISMISS_PET)) return SPELL_FAILED_ALREADY_HAVE_SUMMON; |