[2779] Use Unit::RemoveAllAurasOnEvade. Requires C-MaNGOS [12316]

Schmoozerd · Schmoozerd · commit 04d2efe7ebd4 · 2012-12-17T23:45:15.000+01:00
diff --git a/base/escort_ai.cpp b/base/escort_ai.cpp
@@ -209,7 +209,7 @@ void npc_escortAI::JustRespawned()
 
 void npc_escortAI::EnterEvadeMode()
 {
-    m_creature->RemoveAllAuras();
+    m_creature->RemoveAllAurasOnEvade();
     m_creature->DeleteThreatList();
     m_creature->CombatStop(true);
     m_creature->SetLootRecipient(NULL);
diff --git a/base/follower_ai.cpp b/base/follower_ai.cpp
@@ -157,7 +157,7 @@ void FollowerAI::JustRespawned()
 
 void FollowerAI::EnterEvadeMode()
 {
-    m_creature->RemoveAllAuras();
+    m_creature->RemoveAllAurasOnEvade();
     m_creature->DeleteThreatList();
     m_creature->CombatStop(true);
     m_creature->SetLootRecipient(NULL);
diff --git a/include/sc_creature.cpp b/include/sc_creature.cpp
@@ -123,7 +123,7 @@ void ScriptedAI::UpdateAI(const uint32 uiDiff)
  */
 void ScriptedAI::EnterEvadeMode()
 {
-    m_creature->RemoveAllAuras();
+    m_creature->RemoveAllAurasOnEvade();
     m_creature->DeleteThreatList();
     m_creature->CombatStop(true);
 
diff --git a/scripts/eastern_kingdoms/molten_core/boss_majordomo_executus.cpp b/scripts/eastern_kingdoms/molten_core/boss_majordomo_executus.cpp
@@ -129,7 +129,7 @@ struct MANGOS_DLL_DECL boss_majordomoAI : public ScriptedAI
         else                                                // Finished the encounter, DONE
         {
             // Exit combat
-            m_creature->RemoveAllAuras();
+            m_creature->RemoveAllAurasOnEvade();
             m_creature->DeleteThreatList();
             m_creature->CombatStop(true);
             m_creature->SetLootRecipient(NULL);
diff --git a/scripts/eastern_kingdoms/scarlet_enclave/ebon_hold.cpp b/scripts/eastern_kingdoms/scarlet_enclave/ebon_hold.cpp
@@ -2674,7 +2674,7 @@ struct MANGOS_DLL_DECL npc_fellow_death_knightAI : public ScriptedAI
         }
         else if (m_pInstance->GetData(TYPE_BATTLE) == DONE)
         {
-            m_creature->RemoveAllAuras();
+            m_creature->RemoveAllAurasOnEvade();
             m_creature->DeleteThreatList();
             m_creature->CombatStop(true);
             m_creature->LoadCreatureAddon(true);
@@ -2806,7 +2806,7 @@ struct MANGOS_DLL_DECL npc_acherus_deathchargerAI : public ScriptedAI
     {
         if (m_bIsRiderDead)
         {
-            m_creature->RemoveAllAuras();
+            m_creature->RemoveAllAurasOnEvade();
             m_creature->DeleteThreatList();
             m_creature->CombatStop(true);
             m_creature->LoadCreatureAddon(true);
diff --git a/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp b/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp
@@ -129,7 +129,7 @@ struct MANGOS_DLL_DECL boss_scarlet_commander_mograineAI : public ScriptedAI
                 m_creature->InterruptNonMeleeSpells(false);
 
             m_creature->ClearComboPointHolders();
-            m_creature->RemoveAllAuras();
+            m_creature->RemoveAllAurasOnDeath();
             m_creature->ClearAllReactives();
 
             m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
diff --git a/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp b/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp
@@ -371,7 +371,7 @@ struct MANGOS_DLL_DECL mob_arugal_voidwalkerAI : public ScriptedAI
 
     void EnterEvadeMode() override
     {
-        m_creature->RemoveAllAuras();
+        m_creature->RemoveAllAurasOnEvade();
         m_creature->DeleteThreatList();
         m_creature->CombatStop(true);
         m_creature->LoadCreatureAddon(true);
diff --git a/scripts/eastern_kingdoms/stranglethorn_vale.cpp b/scripts/eastern_kingdoms/stranglethorn_vale.cpp
@@ -64,7 +64,7 @@ struct MANGOS_DLL_DECL mob_yennikuAI : public ScriptedAI
     {
         if (m_uiResetTimer)
         {
-            m_creature->RemoveAllAuras();
+            m_creature->RemoveAllAurasOnEvade();
             m_creature->DeleteThreatList();
             m_creature->CombatStop(true);
             m_creature->LoadCreatureAddon(true);
diff --git a/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp b/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp
@@ -119,7 +119,7 @@ struct MANGOS_DLL_DECL boss_felmystAI : public ScriptedAI
 
     void EnterEvadeMode() override
     {
-        m_creature->RemoveAllAuras();
+        m_creature->RemoveAllAurasOnEvade();
         m_creature->DeleteThreatList();
         m_creature->CombatStop(true);
 
diff --git a/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp b/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp
@@ -125,7 +125,7 @@ struct MANGOS_DLL_DECL boss_kalecgosAI : public ScriptedAI
         // Check if the boss is uncorrupted when evading
         if (m_bIsUncorrupted)
         {
-            m_creature->RemoveAllAuras();
+            m_creature->RemoveAllAurasOnEvade();
             m_creature->DeleteThreatList();
             m_creature->CombatStop(true);
             m_creature->LoadCreatureAddon(true);
diff --git a/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp b/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp
@@ -129,7 +129,7 @@ struct MANGOS_DLL_DECL boss_nalorakkAI : public ScriptedAI
     // Nalorakk evades only after the trash waves are finished
     void EnterEvadeMode() override
     {
-        m_creature->RemoveAllAuras();
+        m_creature->RemoveAllAurasOnEvade();
         m_creature->DeleteThreatList();
         m_creature->CombatStop(true);
         m_creature->LoadCreatureAddon(true);
diff --git a/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp b/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp
@@ -151,7 +151,7 @@ struct MANGOS_DLL_DECL boss_mandokirAI : public ScriptedAI
 
     void EnterEvadeMode() override
     {
-        m_creature->RemoveAllAuras();
+        m_creature->RemoveAllAurasOnEvade();
         m_creature->DeleteThreatList();
         m_creature->CombatStop(true);
         m_creature->LoadCreatureAddon(true);
diff --git a/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp b/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp
@@ -197,7 +197,7 @@ void hyjalAI::Reset()
 
 void hyjalAI::EnterEvadeMode()
 {
-    m_creature->RemoveAllAuras();
+    m_creature->RemoveAllAurasOnEvade();
     m_creature->DeleteThreatList();
     m_creature->CombatStop(true);
 
diff --git a/scripts/kalimdor/moonglade.cpp b/scripts/kalimdor/moonglade.cpp
@@ -675,7 +675,7 @@ struct MANGOS_DLL_DECL boss_eranikusAI : public ScriptedAI
     {
         if (m_creature->GetHealthPercent() < 20.0f)
         {
-            m_creature->RemoveAllAuras();
+            m_creature->RemoveAllAurasOnEvade();
             m_creature->DeleteThreatList();
             m_creature->CombatStop(true);
             m_creature->LoadCreatureAddon(true);
diff --git a/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp b/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp
@@ -166,7 +166,7 @@ struct MANGOS_DLL_DECL npc_general_andorovAI : public ScriptedAI, private Dialog
         if (!m_pInstance)
             return;
 
-        m_creature->RemoveAllAuras();
+        m_creature->RemoveAllAurasOnEvade();
         m_creature->DeleteThreatList();
         m_creature->CombatStop(true);
 
@@ -320,7 +320,7 @@ struct MANGOS_DLL_DECL npc_kaldorei_eliteAI : public ScriptedAI
         if (!m_pInstance)
             return;
 
-        m_creature->RemoveAllAuras();
+        m_creature->RemoveAllAurasOnEvade();
         m_creature->DeleteThreatList();
         m_creature->CombatStop(true);
 
diff --git a/scripts/kalimdor/the_barrens.cpp b/scripts/kalimdor/the_barrens.cpp
@@ -190,7 +190,7 @@ struct MANGOS_DLL_DECL npc_taskmaster_fizzuleAI : public ScriptedAI
     {
         if (m_uiResetTimer)
         {
-            m_creature->RemoveAllAuras();
+            m_creature->RemoveAllAurasOnEvade();
             m_creature->DeleteThreatList();
             m_creature->CombatStop(true);
             m_creature->LoadCreatureAddon(true);
diff --git a/scripts/northrend/azjol-nerub/ahnkahet/boss_taldaram.cpp b/scripts/northrend/azjol-nerub/ahnkahet/boss_taldaram.cpp
@@ -134,7 +134,7 @@ struct MANGOS_DLL_DECL boss_taldaramAI : public ScriptedAI
         if (m_uiEmbraceTimer)
             return;
 
-        m_creature->RemoveAllAuras();
+        m_creature->RemoveAllAurasOnEvade();
         m_creature->DeleteThreatList();
         m_creature->CombatStop(true);
         m_creature->LoadCreatureAddon(true);
diff --git a/scripts/northrend/howling_fjord.cpp b/scripts/northrend/howling_fjord.cpp
@@ -312,7 +312,7 @@ struct MANGOS_DLL_DECL npc_silvermoon_harryAI : public ScriptedAI
                 {
                     uiDamage = 0;                           // Take 0 damage
 
-                    m_creature->RemoveAllAuras();
+                    m_creature->RemoveAllAurasOnDeath();
                     m_creature->DeleteThreatList();
                     m_creature->CombatStop(true);
 
diff --git a/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_deathbringer_saurfang.cpp b/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_deathbringer_saurfang.cpp
@@ -202,7 +202,7 @@ struct MANGOS_DLL_DECL boss_deathbringer_saurfangAI : public ScriptedAI
 
     void EnterEvadeMode() override
     {
-        m_creature->RemoveAllAuras();
+        m_creature->RemoveAllAurasOnEvade();
         m_creature->DeleteThreatList();
         m_creature->CombatStop(true);
 
diff --git a/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_sindragosa.cpp b/scripts/northrend/icecrown_citadel/icecrown_citadel/boss_sindragosa.cpp
@@ -548,7 +548,7 @@ struct MANGOS_DLL_DECL npc_rimefang_iccAI : public ScriptedAI
     // evade to point on platform
     void EnterEvadeMode() override
     {
-        m_creature->RemoveAllAuras();
+        m_creature->RemoveAllAurasOnEvade();
         m_creature->DeleteThreatList();
         m_creature->CombatStop(true);
 
@@ -724,7 +724,7 @@ struct MANGOS_DLL_DECL npc_spinestalker_iccAI : public ScriptedAI
 
     void EnterEvadeMode() override
     {
-        m_creature->RemoveAllAuras();
+        m_creature->RemoveAllAurasOnEvade();
         m_creature->DeleteThreatList();
         m_creature->CombatStop(true);
 
diff --git a/scripts/northrend/nexus/oculus/boss_urom.cpp b/scripts/northrend/nexus/oculus/boss_urom.cpp
@@ -206,7 +206,7 @@ struct MANGOS_DLL_DECL boss_uromAI : public ScriptedAI
 
         if (m_bIsPlatformPhase)
         {
-            m_creature->RemoveAllAuras();
+            m_creature->RemoveAllAurasOnEvade();
             m_creature->DeleteThreatList();
             m_creature->CombatStop(true);
 
diff --git a/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp b/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp
@@ -344,7 +344,7 @@ struct MANGOS_DLL_DECL mob_molten_golemAI : public ScriptedAI
     void EnterEvadeMode() override
     {
         // Evade but keep the current location
-        m_creature->RemoveAllAuras();
+        m_creature->RemoveAllAurasOnEvade();
         m_creature->DeleteThreatList();
         m_creature->CombatStop(true);
         m_creature->LoadCreatureAddon(true);
diff --git a/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp b/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp
@@ -120,7 +120,7 @@ struct MANGOS_DLL_DECL mob_vrykul_skeletonAI : public ScriptedAI
             uiDamage = 0;
             m_uiReviveTimer = 6000;
             m_creature->SetHealth(0);
-            m_creature->RemoveAllAuras();
+            m_creature->RemoveAllAurasOnDeath();
             m_creature->GetMotionMaster()->Clear();
             m_creature->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_DEAD);
             m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
diff --git a/scripts/outland/black_temple/boss_illidan.cpp b/scripts/outland/black_temple/boss_illidan.cpp
@@ -1326,7 +1326,7 @@ struct MANGOS_DLL_DECL boss_maievAI : public ScriptedAI, private DialogueHelper
     // Custom evade - don't allow her to return to home position
     void EnterEvadeMode() override
     {
-        m_creature->RemoveAllAuras();
+        m_creature->RemoveAllAurasOnEvade();
         m_creature->DeleteThreatList();
         m_creature->CombatStop(true);
         m_creature->LoadCreatureAddon(true);
diff --git a/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp b/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp
@@ -87,7 +87,7 @@ struct MANGOS_DLL_DECL boss_broggokAI : public ScriptedAI
 
     void EnterEvadeMode() override
     {
-        m_creature->RemoveAllAuras();
+        m_creature->RemoveAllAurasOnEvade();
         m_creature->DeleteThreatList();
         m_creature->CombatStop(true);
         m_creature->LoadCreatureAddon(true);
diff --git a/scripts/outland/shadowmoon_valley.cpp b/scripts/outland/shadowmoon_valley.cpp
@@ -1491,7 +1491,7 @@ struct MANGOS_DLL_DECL npc_spawned_oronok_tornheartAI : public ScriptedAI, priva
 
     void EnterEvadeMode() override
     {
-        m_creature->RemoveAllAuras();
+        m_creature->RemoveAllAurasOnEvade();
         m_creature->DeleteThreatList();
         m_creature->CombatStop(true);
         m_creature->LoadCreatureAddon(true);
diff --git a/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp b/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp
@@ -143,7 +143,7 @@ struct MANGOS_DLL_DECL npc_millhouse_manastormAI : public ScriptedAI, private Di
 
     void EnterEvadeMode() override
     {
-        m_creature->RemoveAllAuras();
+        m_creature->RemoveAllAurasOnEvade();
         m_creature->DeleteThreatList();
         m_creature->CombatStop(true);
         m_creature->LoadCreatureAddon(true);
diff --git a/scripts/outland/tempest_keep/arcatraz/boss_dalliah.cpp b/scripts/outland/tempest_keep/arcatraz/boss_dalliah.cpp
@@ -98,7 +98,7 @@ struct MANGOS_DLL_DECL boss_dalliahAI : public ScriptedAI
 
     void EnterEvadeMode() override
     {
-        m_creature->RemoveAllAuras();
+        m_creature->RemoveAllAurasOnEvade();
         m_creature->DeleteThreatList();
         m_creature->CombatStop(true);
         m_creature->LoadCreatureAddon(true);
diff --git a/scripts/outland/tempest_keep/arcatraz/boss_soccothrates.cpp b/scripts/outland/tempest_keep/arcatraz/boss_soccothrates.cpp
@@ -129,7 +129,7 @@ struct MANGOS_DLL_DECL boss_soccothratesAI : public ScriptedAI, private Dialogue
 
     void EnterEvadeMode() override
     {
-        m_creature->RemoveAllAuras();
+        m_creature->RemoveAllAurasOnEvade();
         m_creature->DeleteThreatList();
         m_creature->CombatStop(true);
         m_creature->LoadCreatureAddon(true);
diff --git a/sd2_revision_nr.h b/sd2_revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __SD2_REVISION_NR_H__
 #define __SD2_REVISION_NR_H__
- #define SD2_REVISION_NR "2778"
+ #define SD2_REVISION_NR "2779"
 #endif // __SD2_REVISION_NR_H__
diff --git a/sql/scriptdev2_script_full.sql b/sql/scriptdev2_script_full.sql
@@ -3,7 +3,7 @@
 --
 
 DELETE FROM sd2_db_version;
-INSERT INTO sd2_db_version (version) VALUES ('ScriptDev2 (for C-MaNGOS 12308+) ');
+INSERT INTO sd2_db_version (version) VALUES ('ScriptDev2 (for C-MaNGOS 12316+) ');
 
 --
 -- Below contains data for table `script_texts` mainly used in C++ parts.
diff --git a/sql/updates/r2773_scriptdev2.sql b/sql/updates/r2773_scriptdev2.sql
@@ -1 +1 @@
-UPDATE sd2_db_version SET version='ScriptDev2 (for C-MaNGOS 123 123 12308+) ';
+UPDATE sd2_db_version SET version='ScriptDev2 (for C-MaNGOS 12308+) ';
diff --git a/sql/updates/r2779_scriptdev2.sql b/sql/updates/r2779_scriptdev2.sql
@@ -0,0 +1 @@
+UPDATE sd2_db_version SET version='ScriptDev2 (for C-MaNGOS 12316+) ';

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ void npc_escortAI::JustRespawned()`
`209`	`209`
`210`	`210`	`void npc_escortAI::EnterEvadeMode()`
`211`	`211`	`{`
`212`		`- m_creature->RemoveAllAuras();`
	`212`	`+ m_creature->RemoveAllAurasOnEvade();`
`213`	`213`	`m_creature->DeleteThreatList();`
`214`	`214`	`m_creature->CombatStop(true);`
`215`	`215`	`m_creature->SetLootRecipient(NULL);`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ void FollowerAI::JustRespawned()`
`157`	`157`
`158`	`158`	`void FollowerAI::EnterEvadeMode()`
`159`	`159`	`{`
`160`		`- m_creature->RemoveAllAuras();`
	`160`	`+ m_creature->RemoveAllAurasOnEvade();`
`161`	`161`	`m_creature->DeleteThreatList();`
`162`	`162`	`m_creature->CombatStop(true);`
`163`	`163`	`m_creature->SetLootRecipient(NULL);`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ void ScriptedAI::UpdateAI(const uint32 uiDiff)`
`123`	`123`	`*/`
`124`	`124`	`void ScriptedAI::EnterEvadeMode()`
`125`	`125`	`{`
`126`		`- m_creature->RemoveAllAuras();`
	`126`	`+ m_creature->RemoveAllAurasOnEvade();`
`127`	`127`	`m_creature->DeleteThreatList();`
`128`	`128`	`m_creature->CombatStop(true);`
`129`	`129`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ struct MANGOS_DLL_DECL boss_majordomoAI : public ScriptedAI`
`129`	`129`	`else // Finished the encounter, DONE`
`130`	`130`	`{`
`131`	`131`	`// Exit combat`
`132`		`- m_creature->RemoveAllAuras();`
	`132`	`+ m_creature->RemoveAllAurasOnEvade();`
`133`	`133`	`m_creature->DeleteThreatList();`
`134`	`134`	`m_creature->CombatStop(true);`
`135`	`135`	`m_creature->SetLootRecipient(NULL);`
Original file line number	Diff line number	Diff line change
`@@ -2674,7 +2674,7 @@ struct MANGOS_DLL_DECL npc_fellow_death_knightAI : public ScriptedAI`
`2674`	`2674`	`}`
`2675`	`2675`	`else if (m_pInstance->GetData(TYPE_BATTLE) == DONE)`
`2676`	`2676`	`{`
`2677`		`- m_creature->RemoveAllAuras();`
	`2677`	`+ m_creature->RemoveAllAurasOnEvade();`
`2678`	`2678`	`m_creature->DeleteThreatList();`
`2679`	`2679`	`m_creature->CombatStop(true);`
`2680`	`2680`	`m_creature->LoadCreatureAddon(true);`
`@@ -2806,7 +2806,7 @@ struct MANGOS_DLL_DECL npc_acherus_deathchargerAI : public ScriptedAI`
`2806`	`2806`	`{`
`2807`	`2807`	`if (m_bIsRiderDead)`
`2808`	`2808`	`{`
`2809`		`- m_creature->RemoveAllAuras();`
	`2809`	`+ m_creature->RemoveAllAurasOnEvade();`
`2810`	`2810`	`m_creature->DeleteThreatList();`
`2811`	`2811`	`m_creature->CombatStop(true);`
`2812`	`2812`	`m_creature->LoadCreatureAddon(true);`
Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,7 @@ struct MANGOS_DLL_DECL mob_arugal_voidwalkerAI : public ScriptedAI`
`371`	`371`
`372`	`372`	`void EnterEvadeMode() override`
`373`	`373`	`{`
`374`		`- m_creature->RemoveAllAuras();`
	`374`	`+ m_creature->RemoveAllAurasOnEvade();`
`375`	`375`	`m_creature->DeleteThreatList();`
`376`	`376`	`m_creature->CombatStop(true);`
`377`	`377`	`m_creature->LoadCreatureAddon(true);`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ struct MANGOS_DLL_DECL mob_yennikuAI : public ScriptedAI`
`64`	`64`	`{`
`65`	`65`	`if (m_uiResetTimer)`
`66`	`66`	`{`
`67`		`- m_creature->RemoveAllAuras();`
	`67`	`+ m_creature->RemoveAllAurasOnEvade();`
`68`	`68`	`m_creature->DeleteThreatList();`
`69`	`69`	`m_creature->CombatStop(true);`
`70`	`70`	`m_creature->LoadCreatureAddon(true);`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ struct MANGOS_DLL_DECL boss_felmystAI : public ScriptedAI`
`119`	`119`
`120`	`120`	`void EnterEvadeMode() override`
`121`	`121`	`{`
`122`		`- m_creature->RemoveAllAuras();`
	`122`	`+ m_creature->RemoveAllAurasOnEvade();`
`123`	`123`	`m_creature->DeleteThreatList();`
`124`	`124`	`m_creature->CombatStop(true);`
`125`	`125`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ struct MANGOS_DLL_DECL boss_kalecgosAI : public ScriptedAI`
`125`	`125`	`// Check if the boss is uncorrupted when evading`
`126`	`126`	`if (m_bIsUncorrupted)`
`127`	`127`	`{`
`128`		`- m_creature->RemoveAllAuras();`
	`128`	`+ m_creature->RemoveAllAurasOnEvade();`
`129`	`129`	`m_creature->DeleteThreatList();`
`130`	`130`	`m_creature->CombatStop(true);`
`131`	`131`	`m_creature->LoadCreatureAddon(true);`