diff options
| author | Shocker <shocker@freakz.ro> | 2011-10-24 10:43:47 -0700 |
|---|---|---|
| committer | Shocker <shocker@freakz.ro> | 2011-10-24 10:43:47 -0700 |
| commit | 10bca6c268ae4e2f1efa6a2296bed063e65a8ae1 (patch) | |
| tree | 226efaa7db8e7082fdc64d9f6d4f0943f1a5d925 /src/server/game/Spells/Spell.cpp | |
| parent | ce034bd544ff9c494e5a197a5d13d95cefec70db (diff) | |
| parent | 5514523a7c181c49b915b0b938c18f80c8a342c3 (diff) | |
Merge pull request #3596 from ille/master
use effectMask to calculate mechanicMask in ModSpellDuration
Closes #1599
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rwxr-xr-x | src/server/game/Spells/Spell.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 4d7534509e4..c3afe94d2ff 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -1537,7 +1537,7 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit* unit, const uint32 effectMask, bool if (AuraApplication* aurApp = m_spellAura->GetApplicationOfTarget(m_originalCaster->GetGUID())) positive = aurApp->IsPositive(); - duration = m_originalCaster->ModSpellDuration(aurSpellInfo, unit, duration, positive); + duration = m_originalCaster->ModSpellDuration(aurSpellInfo, unit, duration, positive, effectMask); // Haste modifies duration of channeled spells if (m_spellInfo->IsChanneled()) |