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

Added missing locks + improved comments

Browse Source 
Made use of `nameof` instead of `toString`
This commit is contained in:
Chomp
2025-06-02 12:27:39 +01:00
parent 54fe3cf7c5
commit 2165e407eb
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/SPTarkov.Server.Core/Generators/BotLootGenerator.cs
+3 -3
View File
@@ -62,7 +62,7 @@ public class BotLootGenerator(
/// Add loot to bots containers
/// </summary>
/// <param name="sessionId">Session id</param>
/// <param name="botJsonTemplate">Base json db file for the bot having its loot generated</param>
/// <param name="botJsonTemplate">Clone of Base JSON db file for the bot having its loot generated</param>
/// <param name="isPmc">Will bot be a pmc</param>
/// <param name="botRole">Role of bot, e.g. asssult</param>
/// <param name="botInventory">Inventory to add loot to</param>
@@ -371,12 +371,12 @@ public class BotLootGenerator(
{
HashSet<EquipmentSlots> result = [EquipmentSlots.Pockets];
if ((botInventory.Items ?? []).Any(item => item.SlotId == EquipmentSlots.TacticalVest.ToString()))
if ((botInventory.Items ?? []).Any(item => item.SlotId == nameof(EquipmentSlots.TacticalVest)))
{
result.Add(EquipmentSlots.TacticalVest);
}
if ((botInventory.Items ?? []).Any(item => item.SlotId == EquipmentSlots.Backpack.ToString()))
if ((botInventory.Items ?? []).Any(item => item.SlotId == nameof(EquipmentSlots.Backpack)))
{
result.Add(EquipmentSlots.Backpack);
}
Libraries/SPTarkov.Server.Core/Services/BotLootCacheService.cs
+13 -3
View File
@@ -28,6 +28,8 @@ public class BotLootCacheService(
private readonly Lock _currencyLock = new();
private readonly Lock _stimLock = new();
private readonly Lock _grenadeLock = new();
private readonly Lock _specialLock = new();
private readonly Lock _healingLock = new();
/// <summary>
/// Remove cached bot loot data
@@ -44,7 +46,9 @@ public class BotLootCacheService(
/// <param name="isPmc">is the bot a pmc</param>
/// <param name="lootType">what type of loot is needed (backpack/pocket/stim/vest etc)</param>
/// <param name="botJsonTemplate">Base json db file for the bot having its loot generated</param>
/// <returns>Dictionary<string, int></returns>
/// <param name="itemPriceMinMax">OPTIONAL - item price min and max value filter</param>
/// <remarks>THIS IS NOT A THREAD SAFE METHOD</remarks>
/// <returns>dictionary</returns>
public Dictionary<string, double> GetLootFromCache(
string botRole,
bool isPmc,
@@ -238,7 +242,10 @@ public class BotLootCacheService(
var itemTemplate = _itemHelper.GetItem(itemKvP.Key).Value;
if (!(IsBulletOrGrenade(itemTemplate.Properties) || IsMagazine(itemTemplate.Properties)))
{
specialLootItems.TryAdd(itemKvP.Key, itemKvP.Value);
lock (_specialLock)
{
specialLootItems.TryAdd(itemKvP.Key, itemKvP.Value);
}
}
}
}
@@ -259,7 +266,10 @@ public class BotLootCacheService(
itemTemplate.Parent != BaseClasses.DRUGS
)
{
healingItems.TryAdd(itemKvP.Key, itemKvP.Value);
lock (_healingLock)
{
healingItems.TryAdd(itemKvP.Key, itemKvP.Value);
}
}
}
}