aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Spells/SpellScript.cpp
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2015-01-07 22:48:34 +0100
committerjackpoz <giacomopoz@gmail.com>2015-01-17 17:46:22 +0100
commit6df3f795ba18d2259ce3db925c99608194d3a3d1 (patch)
treea2cebceda67305eee04ec1f32546cc0ca6516438 /src/server/game/Spells/SpellScript.cpp
parentaca47618d21c2de5d84df19c5919fceaa6b4edf5 (diff)
Core/Aura: Replace assert with logged error for invalid AuraRemoveMode
Fix AuraScript::Remove() triggering an assert with default parameter and log an error when Aura is removed with invalid mode AURA_REMOVE_NONE instead of triggering an assert deep down in the call tree. Fix https://github.com/TrinityCore/TrinityCore/issues/714 , triggered by spell 50240 "Evasive Maneuvers" script (cherry picked from commit 9ea93eae33dcf776537a41e9c9ff33a31d6e3e19)
Diffstat (limited to 'src/server/game/Spells/SpellScript.cpp')
-rw-r--r--src/server/game/Spells/SpellScript.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp
index c1ea5b86498..33773a57631 100644
--- a/src/server/game/Spells/SpellScript.cpp
+++ b/src/server/game/Spells/SpellScript.cpp
@@ -1023,9 +1023,9 @@ DynamicObject* AuraScript::GetDynobjOwner() const
return m_aura->GetDynobjOwner();
}
-void AuraScript::Remove(uint32 removeMode)
+void AuraScript::Remove(AuraRemoveMode removeMode)
{
- m_aura->Remove((AuraRemoveMode)removeMode);
+ m_aura->Remove(removeMode);
}
Aura* AuraScript::GetAura() const