From f124ae14a968f27af381c13cd1b429ef00e159db Mon Sep 17 00:00:00 2001
From: UltraNix <80540499+UltraNix@users.noreply.github.com>
Date: Mon, 11 Apr 2022 17:01:40 +0200
Subject: [PATCH] =?UTF-8?q?fix(Scripts/BlackwingLair):=20Do=20not=20spawn?=
 =?UTF-8?q?=20more=20than=2052=20Razorgore's=20add=E2=80=A6=20(#11274)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BlackwingLair/instance_blackwing_lair.cpp | 90 +++++++++++++++----
 1 file changed, 74 insertions(+), 16 deletions(-)

diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
index 9730ab407..1ee8c63f4 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
@@ -27,6 +27,8 @@
 #include "TemporarySummon.h"
 #include "blackwing_lair.h"
 
+#include <array>
+
 DoorData const doorData[] =
 {
     { GO_PORTCULLIS_RAZORGORE,      DATA_RAZORGORE_THE_UNTAMED,  DOOR_TYPE_PASSAGE, BOUNDARY_NONE}, // ID 175946 || GUID 7230
@@ -83,6 +85,7 @@ public:
             EggEvent = 0;
             NefarianLeftTunnel = 0;
             NefarianRightTunnel = 0;
+            addsCount.fill(0);
         }
 
         void OnCreatureCreate(Creature* creature) override
@@ -98,11 +101,25 @@ public:
                     chromaggusGUID = creature->GetGUID();
                     break;
                 case NPC_BLACKWING_DRAGON:
+                    ++addsCount[0];
+                    if (Creature* razor = instance->GetCreature(razorgoreGUID))
+                    {
+                        if (CreatureAI* razorAI = razor->AI())
+                        {
+                            razorAI->JustSummoned(creature);
+                        }
+                    }
+                    break;
                 case NPC_BLACKWING_LEGIONAIRE:
                 case NPC_BLACKWING_MAGE:
+                    ++addsCount[1];
                     if (Creature* razor = instance->GetCreature(razorgoreGUID))
+                    {
                         if (CreatureAI* razorAI = razor->AI())
+                        {
                             razorAI->JustSummoned(creature);
+                        }
+                    }
                     break;
                 case NPC_BLACKWING_GUARDSMAN:
                     guardList.push_back(creature->GetGUID());
@@ -286,15 +303,23 @@ public:
             {
                 switch (data)
                 {
+                    case DONE:
+                        EggEvent = data;
+                        break;
+                    case FAIL:
+                        _events.CancelEvent(EVENT_RAZOR_SPAWN);
+                        break;
                     case IN_PROGRESS:
                         _events.ScheduleEvent(EVENT_RAZOR_SPAWN, 45 * IN_MILLISECONDS);
                         EggEvent = data;
                         EggCount = 0;
+                        addsCount.fill(0);
                         break;
                     case NOT_STARTED:
                         _events.CancelEvent(EVENT_RAZOR_SPAWN);
                         EggEvent = data;
                         EggCount = 0;
+                        addsCount.fill(0);
 
                         for (ObjectGuid const& guid : EggList)
                         {
@@ -373,20 +398,6 @@ public:
         {
             switch (unit->GetEntry())
             {
-                case NPC_RAZORGORE:
-                    //! HACK, needed because of buggy CreatureAI after charm
-                    if (EggEvent == DONE)
-                    {
-                        if (unit->GetEntry() == NPC_RAZORGORE && GetBossState(DATA_RAZORGORE_THE_UNTAMED) != DONE)
-                        {
-                            SetBossState(DATA_RAZORGORE_THE_UNTAMED, DONE);
-                        }
-                    }
-                    else
-                    {
-                        _events.CancelEvent(EVENT_RAZOR_SPAWN);
-                    }
-                    break;
                 case NPC_BLACK_DRAKONID:
                 case NPC_BLUE_DRAKONID:
                 case NPC_BRONZE_DRAKONID:
@@ -423,6 +434,23 @@ public:
                         }
                     }
                     break;
+                case NPC_BLACKWING_DRAGON:
+                    --addsCount[0];
+                    if (EggEvent != DONE && _events.GetTimeUntilEvent(EVENT_RAZOR_SPAWN) == Milliseconds::max())
+                    {
+                        _events.ScheduleEvent(EVENT_RAZOR_SPAWN, 1s);
+                    }
+                    break;
+                case NPC_BLACKWING_LEGIONAIRE:
+                case NPC_BLACKWING_MAGE:
+                    --addsCount[1];
+                    if (EggEvent != DONE && _events.GetTimeUntilEvent(EVENT_RAZOR_SPAWN) == Milliseconds::max())
+                    {
+                        _events.ScheduleEvent(EVENT_RAZOR_SPAWN, 1s);
+                    }
+                    break;
+                default:
+                    break;
             }
         }
 
@@ -440,15 +468,44 @@ public:
                     case EVENT_RAZOR_SPAWN:
                         if (EggEvent == IN_PROGRESS)
                         {
+                            bool spawnMoreAdds = true;
                             for (uint8 i = urand(2, 5); i > 0; --i)
                             {
-                                if (Creature* summon = instance->SummonCreature(Entry[urand(0, 2)], SummonPosition[urand(0, 7)]))
+                                uint32 mobEntry = Entry[urand(0, 2)];
+                                uint32 dragonkinsCount = addsCount[0];
+                                uint32 orcsCount = addsCount[1];
+
+                                // If more than 12 dragonkins...
+                                if (dragonkinsCount >= 12)
+                                {
+                                    //... and more than 40 orcs - stop spawning more adds.
+                                    if (orcsCount >= 40)
+                                    {
+                                        spawnMoreAdds = false;
+                                        break;
+                                    }
+                                    //... - stop spawning them.
+                                    else if (mobEntry == NPC_BLACKWING_DRAGON)
+                                    {
+                                        continue;
+                                    }
+                                }
+                                // If more than 40 orcs - stop spawning them.
+                                else if (orcsCount >= 40 && mobEntry != NPC_BLACKWING_DRAGON)
+                                {
+                                    continue;
+                                }
+
+                                if (Creature* summon = instance->SummonCreature(mobEntry, SummonPosition[urand(0, 7)]))
                                 {
                                     summon->AI()->DoZoneInCombat();
                                 }
                             }
 
-                            _events.ScheduleEvent(EVENT_RAZOR_SPAWN, 15000);
+                            if (spawnMoreAdds)
+                            {
+                                _events.ScheduleEvent(EVENT_RAZOR_SPAWN, 15000);
+                            }
                         }
                         break;
                     case EVENT_RAZOR_PHASE_TWO:
@@ -530,6 +587,7 @@ public:
         uint32 EggEvent;
         GuidList EggList;
         GuidList guardList;
+        std::array<uint32, 2> addsCount;
 
         // Nefarian
         uint32 NefarianLeftTunnel;