From 0506f21f5ee16b5cdf5f02d5fae22a32a2b1f63e Mon Sep 17 00:00:00 2001 From: offl <11556157+offl@users.noreply.github.com> Date: Sat, 4 Sep 2021 02:13:45 +0300 Subject: DB/Creature: Remove remaining non-static flags from DB, finally (#26884) (cherry picked from commit 0e12e23f7784b4a80d3515cb094342cb677e35b2) --- src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp | 1 + src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp | 1 + .../scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp | 3 +++ 3 files changed, 5 insertions(+) (limited to 'src') diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index 5fb0152518c..63681f12790 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -463,6 +463,7 @@ public: void Reset() override { Initialize(); + me->AddUnitFlag(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 a9ee3ca5685..7705a240400 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -942,6 +942,7 @@ class boss_vx_001 : public CreatureScript me->SetEmoteState(EMOTE_STATE_SPECIAL_UNARMED); // This is a hack to force the yet to be unfolded visual state. me->SetReactState(REACT_PASSIVE); _fireFighter = false; + me->AddUnitFlag(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 eb10452a775..db25bfb92fb 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->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); + } me->SetDisableGravity(false); -- cgit v1.2.3