diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-15 16:49:58 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-15 16:49:58 +0200 |
| commit | 21fe779dfbd7bf6dba5cb7db2be268f1405f98bc (patch) | |
| tree | 8bb9db21632f07f745833a4a703e3c0a674c7b3e /src/server/game/Spells/SpellScript.cpp | |
| parent | 0598f90dc002779fe2ae30c133434d7a1c6b9176 (diff) | |
| parent | 4d260a54aebbdabdb9982e297d1e5086f8a68fa9 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/game/Spells/SpellScript.cpp')
| -rw-r--r-- | src/server/game/Spells/SpellScript.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp index 5fb4d69cd02..bb9aab023af 100644 --- a/src/server/game/Spells/SpellScript.cpp +++ b/src/server/game/Spells/SpellScript.cpp @@ -909,6 +909,7 @@ bool AuraScript::_IsDefaultActionPrevented() case AURA_SCRIPT_HOOK_EFFECT_ABSORB: case AURA_SCRIPT_HOOK_EFFECT_SPLIT: case AURA_SCRIPT_HOOK_PREPARE_PROC: + case AURA_SCRIPT_HOOK_PROC: case AURA_SCRIPT_HOOK_EFFECT_PROC: return m_defaultActionPrevented; default: @@ -927,6 +928,7 @@ void AuraScript::PreventDefaultAction() case AURA_SCRIPT_HOOK_EFFECT_ABSORB: case AURA_SCRIPT_HOOK_EFFECT_SPLIT: case AURA_SCRIPT_HOOK_PREPARE_PROC: + case AURA_SCRIPT_HOOK_PROC: case AURA_SCRIPT_HOOK_EFFECT_PROC: m_defaultActionPrevented = true; break; |