diff options
| author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2020-07-06 19:05:43 +0000 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-21 18:57:24 +0100 |
| commit | 74923df35afe6f41b94edada701d50fc53bbaf6e (patch) | |
| tree | ba22c21ba47d7abdd7d50e989156352a0cf55cb3 | |
| parent | 8fd7a4b6e5f6b728c4ae40cfd2080c4dae004e8f (diff) | |
Core/Pools: Attempt to workaround pools being broken since 2015 (#24949)
* Core/Pools: Attempt to workaround pools being broken since 2015
Attempt n°2
* Fix warning
(cherry picked from commit 8c0a315734840f99455026ef443a21ae73d7bc3b)
| -rw-r--r-- | src/server/game/Pools/PoolMgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp index 54f9cc3a464..fdae087c09c 100644 --- a/src/server/game/Pools/PoolMgr.cpp +++ b/src/server/game/Pools/PoolMgr.cpp @@ -285,7 +285,7 @@ void PoolGroup<T>::SpawnObject(ActivePoolData& spawns, uint32 limit, uint64 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<T>(obj.guid))) + if (roll < 0 && (/*obj.guid == triggerFrom ||*/ !spawns.IsActiveObject<T>(obj.guid))) { rolledObjects.push_back(obj); break; @@ -295,9 +295,9 @@ void PoolGroup<T>::SpawnObject(ActivePoolData& spawns, uint32 limit, uint64 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<T>(object.guid); + return /*object.guid == triggerFrom ||*/ !spawns.IsActiveObject<T>(object.guid); }); Trinity::Containers::RandomResize(rolledObjects, count); |