From c50aefac963aca5daeacf409deca9692c6ca3924 Mon Sep 17 00:00:00 2001
From: lachtanek <xhrabec@gmail.com>
Date: Thu, 11 Jan 2018 12:22:56 +0100
Subject: Core/Pools: Fixed spawning in pools with both explicitly and equally
 chanced entries (#21170)

---
 src/server/game/Pools/PoolMgr.cpp | 40 ++++++++++++++-------------------------
 1 file changed, 14 insertions(+), 26 deletions(-)

(limited to 'src/server')

diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp
index c8104291770..d4c78df0d38 100644
--- a/src/server/game/Pools/PoolMgr.cpp
+++ b/src/server/game/Pools/PoolMgr.cpp
@@ -328,36 +328,27 @@ void PoolGroup<T>::SpawnObject(ActivePoolData& spawns, uint32 limit, uint32 trig
         // roll objects to be spawned
         if (!ExplicitlyChanced.empty())
         {
-            while (count && ExplicitlyChanced.size() > rolledObjects.size())
-            {
-                --count;
-                float roll = (float)rand_chance();
+            float roll = (float)rand_chance();
 
-                for (PoolObject& obj : ExplicitlyChanced)
+            for (PoolObject& obj : ExplicitlyChanced)
+            {
+                roll -= obj.chance;
+                // Triggering object is marked as spawned at this time and can be also rolled (respawn case)
+                // so this need explicit check for this case
+                if (roll < 0 && (obj.guid == triggerFrom || !spawns.IsActiveObject<T>(obj.guid)))
                 {
-                    roll -= obj.chance;
-                    // Triggering object is marked as spawned at this time and can be also rolled (respawn case)
-                    // so this need explicit check for this case
-                    if (roll < 0 && (obj.guid == triggerFrom || !spawns.IsActiveObject<T>(obj.guid)))
-                    {
-                        rolledObjects.push_back(obj);
-                        break;
-                    }
+                    rolledObjects.push_back(obj);
+                    break;
                 }
             }
         }
-        else if (!EqualChanced.empty())
-        {
-            rolledObjects = EqualChanced;
 
-            for (auto itr = rolledObjects.begin(); itr != rolledObjects.end();)
+        if (!EqualChanced.empty() && rolledObjects.empty())
+        {
+            std::copy_if(EqualChanced.begin(), EqualChanced.end(), std::back_inserter(rolledObjects), [triggerFrom, &spawns](PoolObject const& object)
             {
-                // remove most of the active objects so there is higher chance inactive ones are spawned
-                if (spawns.IsActiveObject<T>(itr->guid) && urand(1, 4) != 1)
-                    itr = rolledObjects.erase(itr);
-                else
-                    ++itr;
-            }
+                return object.guid == triggerFrom || !spawns.IsActiveObject<T>(object.guid);
+            });
 
             Trinity::Containers::RandomResize(rolledObjects, count);
         }
@@ -365,9 +356,6 @@ void PoolGroup<T>::SpawnObject(ActivePoolData& spawns, uint32 limit, uint32 trig
         // try to spawn rolled objects
         for (PoolObject& obj : rolledObjects)
         {
-            if (spawns.IsActiveObject<T>(obj.guid))
-                continue;
-
             if (obj.guid == triggerFrom)
             {
                 ReSpawn1Object(&obj);
-- 
cgit v1.2.3