Merge branch 'azerothcore:master' into Playerbot

src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp

@@ -222,7 +222,7 @@ public:
 
     void DamageTaken(Unit* who, uint32& damage, DamageEffectType, SpellSchoolMask) override
     {
-        if (_dying && who->GetGUID() != me->GetGUID())
+        if (_dying && who && who->GetGUID() != me->GetGUID())
             damage = 0;
 
         if (me->HealthBelowPctDamaged(0, damage) && instance->GetData(DATA_BUG_TRIO_DEATH) < 2 && !_dying)

src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp

@@ -61,6 +61,7 @@ enum Texts
     SAY_TIRION_INTRO_2              = 1,
     SAY_TIRION_OUTRO_1              = 2,
     SAY_TIRION_OUTRO_2              = 3,
+    SAY_TIRION_OUTRO_3              = 4,
 
     // Terenas Menethil (outro)
     SAY_TERENAS_OUTRO_1             = 0,
@@ -343,6 +344,7 @@ enum MiscData
 {
     LIGHT_SNOWSTORM             = 2490,
     LIGHT_SOULSTORM             = 2508,
+    EQUIP_ASHBRINGER            = 13262,
     MUSIC_FROZEN_THRONE         = 17457,
     MUSIC_SPECIAL               = 17458, // Summon Shambling Horror, Remorseless Winter, Quake, Summon Val'kyr Periodic, Harvest Soul, Vile Spirits
     MUSIC_FURY_OF_FROSTMOURNE   = 17459,
@@ -833,8 +835,7 @@ public:
                     _bFordringMustFallYell = true;
                     if (Creature* tirion = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_HIGHLORD_TIRION_FORDRING)))
                     {
-                        tirion->Yell("The Lich King must fall!", LANG_UNIVERSAL);
-                        tirion->PlayDirectSound(17389);
+                        tirion->AI()->Talk(SAY_TIRION_OUTRO_3);
                     }
                 }
             }
@@ -1354,7 +1355,7 @@ public:
             {
                 // remove glow on ashbringer and tirion
                 me->RemoveAllAuras();
-                SetEquipmentSlots(true);
+                SetEquipmentSlots(false, EQUIP_ASHBRINGER);
             }
         }
 
@@ -1595,7 +1596,7 @@ public:
                             lichKing->SetImmuneToNPC(false);
                             me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE);
                             me->RemoveAllAuras();
-                            SetEquipmentSlots(true);
+                            SetEquipmentSlots(false, EQUIP_ASHBRINGER);
                             me->Attack(lichKing, true);
                             me->GetMotionMaster()->MovePoint(0, 512.16f, -2120.25f, 840.86f);
                         }

src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp

@@ -74,6 +74,8 @@ struct boss_murmur : public BossAI
 
     void CastSupressionOOC()
     {
+        me->m_Events.CancelEventGroup(GROUP_OOC_CAST);
+
         me->m_Events.AddEventAtOffset([this] {
             if (me->FindNearestCreature(NPC_CABAL_SPELLBINDER, 35.0f))
             {
@@ -125,8 +127,13 @@ struct boss_murmur : public BossAI
         }
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
+        if (!who->IsInCombatWith(me))
+        {
+            return;
+        }
+
         _JustEngagedWith();
 
         scheduler.Schedule(28s, [this](TaskContext context)

src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp

@@ -102,7 +102,6 @@ public:
             {
                 if (Creature* broggok = instance->GetCreature(DATA_BROGGOK))
                 {
-                    instance->SetData(DATA_BROGGOK, IN_PROGRESS);
                     broggok->AI()->DoAction(ACTION_PREPARE_BROGGOK);
                 }
             }

src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp

@@ -30,13 +30,15 @@ DoorData const doorData[] =
 ObjectData const gameobjectData[] =
 {
     { GO_BROGGOK_DOOR_REAR, DATA_BROGGOK_REAR_DOOR },
-    { GO_BROGGOK_LEVER,     DATA_BROGGOK_LEVER     }
+    { GO_BROGGOK_LEVER,     DATA_BROGGOK_LEVER     },
+    { 0,                    0,                     }
 };
 
 ObjectData const creatureData[] =
 {
     { NPC_BROGGOK, DATA_BROGGOK },
-    { NPC_KELIDAN, DATA_KELIDAN }
+    { NPC_KELIDAN, DATA_KELIDAN },
+    { 0,           0            }
 };
 
 class instance_blood_furnace : public InstanceMapScript