diff options
Diffstat (limited to 'src')
4 files changed, 9 insertions, 9 deletions
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/eversong_woods.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/eversong_woods.cpp index e84af50db4c..b3d598c7669 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/eversong_woods.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/eversong_woods.cpp @@ -695,7 +695,7 @@ void AddSC_eversong_woods() Script *newscript; newscript = new Script; - newscript->Name = "npc_prospector_anvilward"; + newscript->Name = "npc_prospector_anvilward"; newscript->GetAI = &GetAI_npc_prospector_anvilward; newscript->pGossipHello = &GossipHello_npc_prospector_anvilward; newscript->pGossipSelect = &GossipSelect_npc_prospector_anvilward; diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp index a5b9a2487c8..2341f78ebe3 100644 --- a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp +++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp @@ -1478,7 +1478,7 @@ void AddSC_boss_kaelthas() newscript->RegisterSelf(); newscript = new Script; - newscript->Name = "mob_kael_flamestrike"; + newscript->Name = "mob_kael_flamestrike"; newscript->GetAI = &GetAI_mob_kael_flamestrike; newscript->RegisterSelf(); diff --git a/src/bindings/scripts/scripts/outland/terokkar_forest.cpp b/src/bindings/scripts/scripts/outland/terokkar_forest.cpp index 8f87220819e..aae3a62ea49 100644 --- a/src/bindings/scripts/scripts/outland/terokkar_forest.cpp +++ b/src/bindings/scripts/scripts/outland/terokkar_forest.cpp @@ -654,7 +654,7 @@ void AddSC_terokkar_forest() newscript->RegisterSelf(); newscript = new Script; - newscript->Name = "npc_isla_starmane"; + newscript->Name = "npc_isla_starmane"; newscript->GetAI = &GetAI_npc_isla_starmaneAI; newscript->pQuestAccept = &QuestAccept_npc_isla_starmane; newscript->RegisterSelf(); diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index ec132ee3e7b..94a88fba710 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -4135,13 +4135,13 @@ void Unit::RemoveAllAuras() void Unit::RemoveAllAuras(uint64 casterGUID, Aura * except /*=NULL*/, bool negative /*=true*/, bool positive /*=true*/) { - AuraMap::iterator iter = m_Auras.begin(); - while (!m_Auras.empty()) + for(AuraMap::iterator iter = m_Auras.begin(); iter != m_Auras.end();) { - Aura * aur = (*iter).second; - if (aur != except && (!casterGUID || aur->GetCasterGUID()==casterGUID) - && ((negative && !aur->IsPositive()) || (positive && aur->IsPositive()))) - RemoveAura(aur); + if (iter->second != except && (!casterGUID || iter->second->GetCasterGUID()==casterGUID) + && ((negative && !iter->second->IsPositive()) || (positive && iter->second->IsPositive()))) + RemoveAura(iter); + else + ++iter; } } |