GO Drakkari Canopic Jar (Quest: It Takes Guts.... 12116)

better variant and only one NPC becomes hostile and attacks

(cherry picked from commit 65e53fa)

Author: Thor1423

src/server/scripts/World/go_scripts.cpp

@@ -46,8 +46,7 @@ EndContentData */
 #include "SpellMgr.h"
 #include "TemporarySummon.h"
 #include "WorldSession.h"
-#include <random>
-#include "vector"
+#include <list>
 
 /*######
 ## go_gilded_brazier (Paladin First Trail quest (9678))
@@ -1227,9 +1226,9 @@ class go_bells : public GameObjectScript
 
 enum it_takes_guts
 {
-    ANCIENT_DRAKKARI_SOOTHSAYER     = 26812,
-    ANCIENT_DRAKKARI_WARMONGER      = 26811,
-    NPC_ANCIENT_DRAKKARI_TALK       = 1
+    ANCIENT_DRAKKARI_SOOTHSAYER = 26812,
+    ANCIENT_DRAKKARI_WARMONGER = 26811,
+    NPC_ANCIENT_DRAKKARI_TALK = 1
 };
 
 class go_188499_chest : public GameObjectScript
@@ -1250,30 +1249,32 @@ class go_188499_chest : public GameObjectScript
             if (!player)
                 return;
 
-            std::vector<uint32> entries = { ANCIENT_DRAKKARI_SOOTHSAYER, ANCIENT_DRAKKARI_WARMONGER };
-            if (entries.empty())
-                return;
+            constexpr uint32 entries[] = { ANCIENT_DRAKKARI_SOOTHSAYER, ANCIENT_DRAKKARI_WARMONGER };
+            constexpr size_t entryCount = sizeof(entries) / sizeof(entries[0]);
 
-            std::random_device rd;
-            std::mt19937 gen(rd());
-            std::uniform_int_distribution<> distEntry(0, entries.size() - 1);
-            uint32 chosenEntry = entries[distEntry(gen)];
+            std::list<Creature*> npcList;
 
-            std::list<Creature*> tempList;
-            GetCreatureListWithEntryInGrid(tempList, me, chosenEntry, 30.0f);
+            for (size_t i = 0; i < entryCount; ++i)
+            {
+                std::list<Creature*> tempList;
+                GetCreatureListWithEntryInGrid(tempList, me, entries[i], 30.0f);
 
-            std::vector<ObjectGuid> npcGuids;
-            for (Creature* c : tempList)
-                if (c && c->IsAlive())
-                    npcGuids.push_back(c->GetGUID());
+                for (Creature* c : tempList)
+                    if (c && c->IsAlive())
+                        npcList.push_back(c);
+            }
 
-            if (npcGuids.empty())
+            if (npcList.empty())
                 return;
 
-            std::uniform_int_distribution<> distNpc(0, npcGuids.size() - 1);
-            ObjectGuid selectedGuid = npcGuids[distNpc(gen)];
+            size_t listSize = npcList.size();
+            size_t randIndex = urand(0, listSize - 1);
+
+            auto it = npcList.begin();
+            std::advance(it, randIndex);
 
-            if (Creature* target = ObjectAccessor::GetCreature(*me, selectedGuid))
+            Creature* target = *it;
+            if (target)
             {
                 target->SetFaction(14);
                 target->AI()->AttackStart(player);