Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Pooling: Fixed less and less objects from pools being spawned the longer the server is running

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/00991543167cd15d9ef52a50f19f0b242dfdbe00)
This commit is contained in:
hondacrx
2021-02-18 12:44:04 -05:00
parent 8f5889eb98
commit da273c3a06
1 changed files with 55 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Pools/PoolManager.cs
+55 -46
View File
@@ -604,33 +604,6 @@ namespace Game
return true; return true;
} }
PoolObject RollOne(ActivePoolData spawns, ulong triggerFrom)
{
if (!ExplicitlyChanced.Empty())
{
float roll = (float)RandomHelper.randChance();
for (int i = 0; i < ExplicitlyChanced.Count; ++i)
{
roll -= ExplicitlyChanced[i].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 && (ExplicitlyChanced[i].guid == triggerFrom || !spawns.IsActiveObject<T>(ExplicitlyChanced[i].guid)))
return ExplicitlyChanced[i];
}
}
if (!EqualChanced.Empty())
{
int index = RandomHelper.IRand(0, EqualChanced.Count - 1);
// 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 (EqualChanced[index].guid == triggerFrom || !spawns.IsActiveObject<T>(EqualChanced[index].guid))
return EqualChanced[index];
}
return null;
}
public void DespawnObject(ActivePoolData spawns, ulong guid = 0) public void DespawnObject(ActivePoolData spawns, ulong guid = 0)
{ {
for (int i = 0; i < EqualChanced.Count; ++i) for (int i = 0; i < EqualChanced.Count; ++i)
@@ -776,7 +749,6 @@ namespace Game
return; return;
} }
ulong lastDespawned = 0;
int count = (int)(limit - spawns.GetActiveObjectCount(poolId)); int count = (int)(limit - spawns.GetActiveObjectCount(poolId));
// If triggered from some object respawn this object is still marked as spawned // If triggered from some object respawn this object is still marked as spawned
@@ -786,31 +758,68 @@ namespace Game
++count; ++count;
// This will try to spawn the rest of pool, not guaranteed // This will try to spawn the rest of pool, not guaranteed
for (int i = 0; i < count; ++i) if (count > 0)
{ {
PoolObject obj = RollOne(spawns, triggerFrom); List<PoolObject> rolledObjects = new List<PoolObject>();
if (obj == null)
continue;
if (obj.guid == lastDespawned)
continue;
if (obj.guid == triggerFrom) // roll objects to be spawned
if (!ExplicitlyChanced.Empty())
{ {
ReSpawn1Object(obj); while (count != 0 && ExplicitlyChanced.Count > rolledObjects.Count)
triggerFrom = 0; {
continue; --count;
float roll = (float)RandomHelper.randChance();
foreach (PoolObject obj in 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)))
{
rolledObjects.Add(obj);
break;
}
}
}
} }
spawns.ActivateObject<T>(obj.guid, poolId); else if (!EqualChanced.Empty())
Spawn1Object(obj);
if (triggerFrom != 0)
{ {
// One spawn one despawn no count increase rolledObjects = EqualChanced;
DespawnObject(spawns, triggerFrom);
lastDespawned = triggerFrom; for (var i =0; i < rolledObjects.Count; ++i)
triggerFrom = 0; {
var obj = rolledObjects[i];
// remove most of the active objects so there is higher chance inactive ones are spawned
if (spawns.IsActiveObject<T>(obj.guid) && RandomHelper.URand(1, 4) != 1)
rolledObjects.Remove(obj);
}
rolledObjects.RandomResize((uint)count);
}
// try to spawn rolled objects
foreach (PoolObject obj in rolledObjects)
{
if (spawns.IsActiveObject<T>(obj.guid))
continue;
if (obj.guid == triggerFrom)
{
ReSpawn1Object(obj);
triggerFrom = 0;
}
else
{
spawns.ActivateObject<T>(obj.guid, poolId);
Spawn1Object(obj);
}
} }
} }
// One spawn one despawn no count increase
if (triggerFrom != 0)
DespawnObject(spawns, triggerFrom);
} }
void SpawnQuestObject(ActivePoolData spawns, uint limit, ulong triggerFrom) void SpawnQuestObject(ActivePoolData spawns, uint limit, ulong triggerFrom)