HashSet is created on ctor, no need to recreate, change check to check count not null as its never null

This commit is contained in:
CWX
2025-01-30 09:37:01 +00:00
parent 660154a2e2
commit 065b073f48
2 changed files with 4 additions and 23 deletions
+2 -2
View File
@@ -266,12 +266,12 @@ public class FenceService(
// Is preset
if (item.Upd?.SptPresetId != null)
{
if (assort.BarterScheme?[item.Id] != null)
if (assort.BarterScheme?.ContainsKey(item.Id) ?? false)
{
assort.BarterScheme[item.Id][0][0].Count *= presetModifier;
}
}
else if (assort.BarterScheme?[item.Id] != null)
else if (assort.BarterScheme?.ContainsKey(item.Id) ?? false)
{
assort.BarterScheme[item.Id][0][0].Count *= modifier;
}
+2 -21
View File
@@ -35,23 +35,6 @@ public class ItemFilterService(
return _itemBlacklistCache.Contains(tpl);
}
/**
* Check if the provided template id is blacklisted in config/item.json/lootableItemBlacklist
* @param tpl template id
* @returns true if blacklisted
*/
public bool LootableItemBlacklisted(string tpl)
{
if (_lootableItemBlacklistCache.Count == 0)
{
foreach (var item in _itemConfig.LootableItemBlacklist) {
_itemBlacklistCache.Add(item);
}
}
return _lootableItemBlacklistCache.Contains(tpl);
}
/**
* Check if item is blacklisted from being a reward for player
* @param tpl item tpl to check is on blacklist
@@ -125,7 +108,7 @@ public class ItemFilterService(
*/
public bool IsLootableItemBlacklisted(string itemKey)
{
if (_lootableItemBlacklistCache is null)
if (!_lootableItemBlacklistCache.Any())
{
HydrateLootableItemBlacklist();
}
@@ -135,7 +118,7 @@ public class ItemFilterService(
public bool IsItemBlacklisted(string tpl)
{
if (_itemBlacklistCache is null)
if (!_itemBlacklistCache.Any())
{
HydrateBlacklist();
}
@@ -145,7 +128,6 @@ public class ItemFilterService(
protected void HydrateLootableItemBlacklist()
{
_lootableItemBlacklistCache = [];
foreach (var item in _itemConfig.LootableItemBlacklist)
{
_lootableItemBlacklistCache.Add(item);
@@ -154,7 +136,6 @@ public class ItemFilterService(
protected void HydrateBlacklist()
{
_itemBlacklistCache = [];
foreach (var item in _itemConfig.Blacklist) {
_itemBlacklistCache.Add(item);
}