diff options
author | silinoron <none@none> | 2010-08-23 15:13:20 -0700 |
---|---|---|
committer | silinoron <none@none> | 2010-08-23 15:13:20 -0700 |
commit | 8bebc56b8f4ca872198e7d44c6efbdb8e24e2d8f (patch) | |
tree | 72b7a5d8919ada388368d2da9759e4021329592a /src/server/game/Spells/Spell.cpp | |
parent | c09528a6bf1cee9dbbf45bfd564f52a3a4e4a1b7 (diff) | |
parent | 07a3a1254b78a42a7836efee99dc3d821c726d28 (diff) |
merge
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
-rw-r--r-- | 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 d9395edabfa..64694c502c6 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -7312,7 +7312,7 @@ bool Spell::CallScriptEffectHandlers(SpellEffIndex effIndex) bool preventDefault = false; for(std::list<SpellScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr) { - std::list<SpellScript::EffectHandler>::iterator effEndItr = (*scritr)->EffectHandlers.end(), effItr = (*scritr)->EffectHandlers.begin(); + std::list<SpellScript::EffectHandler>::iterator effEndItr = (*scritr)->OnEffect.end(), effItr = (*scritr)->OnEffect.begin(); for(; effItr != effEndItr ; ++effItr) { // effect execution can be prevented |