From c9973f3a80b19efc67fa441e66adbf9e0d3a7c6d Mon Sep 17 00:00:00 2001
From: Skjalf <47818697+Nyeriah@users.noreply.github.com>
Date: Fri, 7 Apr 2023 12:57:52 -0300
Subject: [PATCH] fix(Scripts/IcecrownCitadel): Fix Svalna crash (#15862)

---
 .../Northrend/IcecrownCitadel/icecrown_citadel.cpp | 14 --------------
 .../IcecrownCitadel/instance_icecrown_citadel.cpp  |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
index 01f4611c4..251b2b31e 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
@@ -1007,13 +1007,6 @@ public:
             me->SendMovementFlagUpdate();
         }
 
-        void AttackStart(Unit* victim) override
-        {
-            if (me->HasReactState(REACT_PASSIVE) || me->IsImmuneToAll())
-                return;
-            BossAI::AttackStart(victim);
-        }
-
         void JustDied(Unit* /*killer*/) override
         {
             _JustDied();
@@ -1039,13 +1032,6 @@ public:
 
         void JustEngagedWith(Unit* /*attacker*/) override
         {
-            if (me->HasReactState(REACT_PASSIVE) || me->IsImmuneToAll())
-            {
-                me->CombatStop(false);
-                me->SetImmuneToAll(true);
-                me->SetReactState(REACT_PASSIVE);
-                return;
-            }
             _JustEngagedWith();
             me->LowerPlayerDamageReq(me->GetMaxHealth());
             if (Creature* crok = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_CROK_SCOURGEBANE)))
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
index 177d56cbb..ca9283c49 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
@@ -1457,7 +1457,7 @@ public:
 
         bool CheckRequiredBosses(uint32 bossId, Player const* player) const override
         {
-            if (player->GetSession() && player->GetSession()->GetSecurity() >= SEC_MODERATOR)
+            if (player && player->GetSession() && player->GetSession()->GetSecurity() >= SEC_MODERATOR)
             {
                 return true;
             }