Merge commit '26c583c24ab7dbbf1fecf3dcd737c1ad543c8b33' into Playerbot_1017

src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp

@@ -366,6 +366,9 @@ public:
                 return;
             }
 
+            if (m_pInstance)
+                m_pInstance->SetData(TYPE_ALGALON, FAIL);
+
             ScriptedAI::EnterEvadeMode(why);
         }
 

src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp

@@ -786,6 +786,18 @@ public:
                         go->SetGoState(data == IN_PROGRESS ? GO_STATE_ACTIVE : GO_STATE_READY);
                         go->EnableCollision(false);
                     }
+
+                    if (data == FAIL)
+                    {
+                        scheduler.Schedule(5s, [this](TaskContext)
+                        {
+                            if (m_algalonTimer && (m_algalonTimer <= 60 || m_algalonTimer == TIMER_ALGALON_TO_SUMMON))
+                            {
+                                instance->SummonCreature(NPC_ALGALON, AlgalonLandPos);
+                            }
+                        });
+                    }
+
                     break;
 
                 // Achievement
@@ -1109,6 +1121,8 @@ public:
 
         void Update(uint32 diff) override
         {
+            InstanceScript::Update(diff);
+
             if (_events.Empty())
                 return;