diff options
| author | jackpoz <giacomopoz@gmail.com> | 2014-05-03 18:52:03 +0200 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2014-05-03 18:52:03 +0200 |
| commit | b7a105bcc86b4791e0deeaff7d8ba697821172ae (patch) | |
| tree | 3c848a49780812170f9e98ad33dda96407c04d22 /src/server/game/Spells/SpellMgr.cpp | |
| parent | 91839946b59121135f92bb05aa4b9c71b3737198 (diff) | |
| parent | 065207b1b8fe04265bd0cc7f386021be0d7e2201 (diff) | |
Merge pull request #11984 from Unholychick/patch-1
Core/Spells: Correct a mistake in HoT aura procs
Diffstat (limited to 'src/server/game/Spells/SpellMgr.cpp')
| -rw-r--r-- | src/server/game/Spells/SpellMgr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index e0a20346242..ba5b8856323 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -773,7 +773,7 @@ SpellProcEventEntry const* SpellMgr::GetSpellProcEvent(uint32 spellId) const return NULL; } -bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellProcEvent, uint32 EventProcFlag, SpellInfo const* procSpell, uint32 procFlags, uint32 procExtra, bool active) const +bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellInfo const* spellProto, SpellProcEventEntry const* spellProcEvent, uint32 EventProcFlag, SpellInfo const* procSpell, uint32 procFlags, uint32 procExtra, bool active) const { // No extra req need uint32 procEvent_procEx = PROC_EX_NONE; @@ -790,7 +790,7 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr *Only damaging Dots can proc auras with PROC_FLAG_TAKEN_DAMAGE - *Only Dots can proc if ONLY has PROC_FLAG_DONE_PERIODIC and spellfamily == 0 or PROC_FLAG_TAKEN_PERIODIC. + *Only Dots can proc if ONLY has PROC_FLAG_DONE_PERIODIC or PROC_FLAG_TAKEN_PERIODIC. *Hots can proc if ONLY has PROC_FLAG_DONE_PERIODIC and spellfamily != 0 @@ -806,7 +806,7 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr * @param procFlags proc_flags of spellProc * @param procExtra proc_EX of procSpell * @param EventProcFlag proc_flags of aura to be procced - * @param spellProcEvent SpellProcEventEntry of aura to be procced + * @param spellProto SpellInfo of aura to be procced */ @@ -821,7 +821,7 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr if (EventProcFlag == PROC_FLAG_DONE_PERIODIC) { /// no aura with only PROC_FLAG_DONE_PERIODIC and spellFamilyName == 0 can proc from a HOT. - if (!spellProcEvent || !spellProcEvent->spellFamilyName) + if (!spellProto->SpellFamilyName) return false; } /// Aura must have positive procflags for a HOT to proc |