aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/game/MotionMaster.cpp1
-rw-r--r--src/game/Unit.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/game/MotionMaster.cpp b/src/game/MotionMaster.cpp
index da811ab02ed..f8241987d16 100644
--- a/src/game/MotionMaster.cpp
+++ b/src/game/MotionMaster.cpp
@@ -464,6 +464,7 @@ void MotionMaster::Mutate(MovementGenerator *m, MovementSlot slot)
{
if(MovementGenerator *curr = Impl[slot])
{
+ Impl[slot] = NULL; // in case a new one is generated in this slot during directdelete
if(i_top == slot && (m_cleanFlag & MMCF_UPDATE))
DelayedDelete(curr);
else
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index c8f280a906f..6f6d323c2a8 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -3903,8 +3903,6 @@ bool Unit::RemoveNoStackAurasDueToAura(Aura *Aur)
return true;
}
- SpellSpecific spellId_spec = GetSpellSpecific(spellId);
-
//bool linked = spellmgr.GetSpellCustomAttr(spellId) & SPELL_ATTR_CU_LINK_AURA? true : false;
for(AuraMap::iterator i = m_Auras.begin(); i != m_Auras.end(); ++i)