From 8c0a315734840f99455026ef443a21ae73d7bc3b Mon Sep 17 00:00:00 2001 From: Giacomo Pozzoni Date: Mon, 6 Jul 2020 19:05:43 +0000 Subject: Core/Pools: Attempt to workaround pools being broken since 2015 (#24949) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Core/Pools: Attempt to workaround pools being broken since 2015 Attempt n°2 * Fix warning --- src/server/game/Pools/PoolMgr.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp index 951366be0a5..3f427526dcf 100644 --- a/src/server/game/Pools/PoolMgr.cpp +++ b/src/server/game/Pools/PoolMgr.cpp @@ -278,7 +278,7 @@ void PoolGroup::SpawnObject(ActivePoolData& spawns, uint32 limit, uint32 trig 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(obj.guid))) + if (roll < 0 && (/*obj.guid == triggerFrom ||*/ !spawns.IsActiveObject(obj.guid))) { rolledObjects.push_back(obj); break; @@ -288,9 +288,9 @@ void PoolGroup::SpawnObject(ActivePoolData& spawns, uint32 limit, uint32 trig if (!EqualChanced.empty() && rolledObjects.empty()) { - std::copy_if(EqualChanced.begin(), EqualChanced.end(), std::back_inserter(rolledObjects), [triggerFrom, &spawns](PoolObject const& object) + std::copy_if(EqualChanced.begin(), EqualChanced.end(), std::back_inserter(rolledObjects), [/*triggerFrom, */&spawns](PoolObject const& object) { - return object.guid == triggerFrom || !spawns.IsActiveObject(object.guid); + return /*object.guid == triggerFrom ||*/ !spawns.IsActiveObject(object.guid); }); Trinity::Containers::RandomResize(rolledObjects, count); -- cgit v1.2.3