DB/Creature: Remove remaining non-static flags from DB, finally (#26884)

4 files changed, 10 insertions, 0 deletions

diff --git a/sql/updates/world/3.3.5/2021_09_04_00_world.sql b/sql/updates/world/3.3.5/2021_09_04_00_world.sql
new file mode 100644
index 00000000000..9b6018789fc
--- /dev/null
+++ b/sql/updates/world/3.3.5/2021_09_04_00_world.sql
@@ -0,0 +1,5 @@
+--
+UPDATE `creature_template` SET `unit_flags` = `unit_flags` &~ 2 WHERE `entry` IN (18374,20308,21466,21467,21600,21601,17651,21823,29281,30809,33651,34108);
+-- They're only unselectable, their faction is hostile, they don't have auras
+-- For now leaving feign death aura, later it should be replaced by passive react state, there's no other option
+UPDATE `creature` SET `unit_flags` = 33554496 WHERE `id` = 26620 AND `unit_flags` & 33554432;
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
index 8dab20baa03..ec5916b28f1 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
@@ -467,6 +467,7 @@ public:
         void Reset() override
         {
             Initialize();
+            me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
 
             if (instance->GetGuidData(DATA_IMAGE_OF_MEDIVH).IsEmpty())
             {
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
index 6efcc6f48e7..26d882a0f2b 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
@@ -939,6 +939,7 @@ class boss_vx_001 : public CreatureScript
                 me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_SPECIAL_UNARMED); // This is a hack to force the yet to be unfolded visual state.
                 me->SetReactState(REACT_PASSIVE);
                 _fireFighter = false;
+                me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
             }
 
             void DamageTaken(Unit* who, uint32& damage, DamageEffectType /*damageType*/, SpellInfo const* /*spellInfo = nullptr*/) override
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
index 3821d0afa79..625146d04c3 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
@@ -156,7 +156,10 @@ struct boss_svala : public BossAI
         if (_introCompleted)
             events.SetPhase(NORMAL);
         else
+        {
             events.SetPhase(IDLE);
+            me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+        }
 
         me->SetDisableGravity(false);