Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 17:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: Remove spellmods from SpellMod owner instead of caster (needed so pet casts properly remove aura charges)

Browse Source
This commit is contained in:
ariel-
2016-09-01 01:09:23 -03:00
committed by Aokromes
parent 87bcba9a1f
commit fe32fffa56
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/server/game/Spells/Spell.cpp
View File

@@ -3672,15 +3672,18 @@ void Spell::finish(bool ok)
{
if (!m_triggeredByAuraSpell)
m_caster->ToPlayer()->UpdatePotionCooldown(this);
}
if (Player* modOwner = m_caster->GetSpellModOwner())
{
// triggered spell pointer can be not set in some cases
// this is needed for proper apply of triggered spell mods
m_caster->ToPlayer()->SetSpellModTakingSpell(this, true);
modOwner->SetSpellModTakingSpell(this, true);
// Take mods after trigger spell (needed for 14177 to affect 48664)
// mods are taken only on succesfull cast and independantly from targets of the spell
m_caster->ToPlayer()->RemoveSpellMods(this);
m_caster->ToPlayer()->SetSpellModTakingSpell(this, false);
modOwner->RemoveSpellMods(this);
modOwner->SetSpellModTakingSpell(this, false);
}
// Stop Attack for some spells