chillcog/SPT-Server-Build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove loot cloners and make LazyLoad return a new result each request

Browse Source
This commit is contained in:
Archangel
2025-08-06 15:33:11 +02:00
parent 40fe4dbd89
commit 8a4f2a297b
2 changed files with 25 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/SPTarkov.Server.Core/Generators/LocationLootGenerator.cs
+14 -26
View File
@@ -101,24 +101,24 @@ public class LocationLootGenerator(
var mapData = databaseService.GetLocation(locationId);
var staticWeaponsOnMapClone = cloner.Clone(mapData.StaticContainers.Value.StaticWeapons);
if (staticWeaponsOnMapClone is null)
var staticWeaponsOnMap = mapData.StaticContainers.Value.StaticWeapons;
if (staticWeaponsOnMap is null)
{
logger.Error(serverLocalisationService.GetText("location-unable_to_find_static_weapon_for_map", locationId));
}
// Add mounted weapons to output loot
result.AddRange(staticWeaponsOnMapClone);
result.AddRange(staticWeaponsOnMap);
var allStaticContainersOnMapClone = cloner.Clone(mapData.StaticContainers.Value.StaticContainers);
if (allStaticContainersOnMapClone is null)
var allStaticContainersOnMap = mapData.StaticContainers.Value.StaticContainers;
if (allStaticContainersOnMap is null)
{
logger.Error(serverLocalisationService.GetText("location-unable_to_find_static_container_for_map", locationId));
}
// Containers that MUST be added to map (e.g. quest containers)
var staticForcedOnMapClone = cloner.Clone(mapData.StaticContainers.Value.StaticForced);
if (staticForcedOnMapClone is null)
var staticForcedOnMap = mapData.StaticContainers.Value.StaticForced;
if (staticForcedOnMap is null)
{
logger.Error(serverLocalisationService.GetText("location-unable_to_find_forced_static_data_for_map", locationId));
}
@@ -126,25 +126,25 @@ public class LocationLootGenerator(
// Remove christmas items from loot data
if (!seasonalEventService.ChristmasEventEnabled())
{
allStaticContainersOnMapClone = allStaticContainersOnMapClone.Where(item =>
allStaticContainersOnMap = allStaticContainersOnMap.Where(item =>
!_seasonalEventConfig.ChristmasContainerIds.Contains(item.Template.Id)
);
}
var staticRandomisableContainersOnMap = GetRandomisableContainersOnMap(allStaticContainersOnMapClone);
var staticRandomisableContainersOnMap = GetRandomisableContainersOnMap(allStaticContainersOnMap);
// Keep track of static loot count
var staticContainerCount = 0;
// Find all 100% spawn containers
var staticLootDist = mapData.StaticLoot;
var guaranteedContainers = GetGuaranteedContainers(allStaticContainersOnMapClone);
var staticLootDist = mapData.StaticLoot.Value;
var guaranteedContainers = GetGuaranteedContainers(allStaticContainersOnMap);
staticContainerCount += guaranteedContainers.Count();
// Add loot to guaranteed containers and add to result
foreach (
var containerWithLoot in guaranteedContainers.Select(container =>
AddLootToContainer(container, staticForcedOnMapClone, staticLootDist.Value, staticAmmoDist, locationId)
AddLootToContainer(container, staticForcedOnMap, staticLootDist, staticAmmoDist, locationId)
)
)
{
@@ -170,13 +170,7 @@ public class LocationLootGenerator(
foreach (var container in staticRandomisableContainersOnMap)
{
var containerWithLoot = AddLootToContainer(
container,
staticForcedOnMapClone,
staticLootDist.Value,
staticAmmoDist,
locationId
);
var containerWithLoot = AddLootToContainer(container, staticForcedOnMap, staticLootDist, staticAmmoDist, locationId);
result.Add(containerWithLoot.Template);
staticLootItemCount += containerWithLoot.Template.Items.Count();
@@ -257,13 +251,7 @@ public class LocationLootGenerator(
}
// Add loot to container and push into result object
var containerWithLoot = AddLootToContainer(
containerObject,
staticForcedOnMapClone,
staticLootDist.Value,
staticAmmoDist,
locationId
);
var containerWithLoot = AddLootToContainer(containerObject, staticForcedOnMap, staticLootDist, staticAmmoDist, locationId);
result.Add(containerWithLoot.Template);
staticContainerCount++;
Libraries/SPTarkov.Server.Core/Utils/Json/LazyLoad.cs
+11 -38
View File
@@ -4,11 +4,6 @@ public class LazyLoad<T>(Func<T> deserialize)
{
private readonly List<Func<T?, T?>> _lazyLoadTransformers = [];
private readonly ReaderWriterLockSlim _lazyLoadTransformersLock = new();
private static readonly TimeSpan _autoCleanerTimeout = TimeSpan.FromSeconds(30);
private bool _isLoaded;
private T? _result;
private Timer? autoCleanerTimeout;
/// <summary>
/// Adds a transformer to modify the value during lazy loading. Transformers execute
@@ -33,44 +28,22 @@ public class LazyLoad<T>(Func<T> deserialize)
{
get
{
if (!_isLoaded)
var result = deserialize();
_lazyLoadTransformersLock.EnterReadLock();
try
{
_result = deserialize();
_isLoaded = true;
_lazyLoadTransformersLock.EnterReadLock();
try
foreach (var transform in _lazyLoadTransformers)
{
foreach (var transform in _lazyLoadTransformers)
{
_result = transform(_result);
}
result = transform(result);
}
catch (Exception)
{
throw;
}
finally
{
_lazyLoadTransformersLock.ExitReadLock();
}
autoCleanerTimeout = new Timer(
_ =>
{
_result = default;
_isLoaded = false;
autoCleanerTimeout?.Change(Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan);
autoCleanerTimeout = null;
},
null,
_autoCleanerTimeout,
Timeout.InfiniteTimeSpan
);
}
finally
{
_lazyLoadTransformersLock.ExitReadLock();
}
autoCleanerTimeout?.Change(_autoCleanerTimeout, Timeout.InfiniteTimeSpan);
return _result;
return result;
}
}
}