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

Merge branches 'main' and 'main' of https://github.com/sp-tarkov/server-csharp

Browse Source
This commit is contained in:
CWX
2025-01-24 12:28:00 +00:00
parent 9cf43cda89 6eecf9f7cc
commit bc76153e3e
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/Core/Services/FenceService.cs
+11 -10
View File
@@ -5,6 +5,7 @@ using Core.Models.Eft.Common.Tables;
using Core.Models.Enums;
using Core.Models.Spt.Config;
using Core.Models.Spt.Fence;
using Core.Models.Utils;
using Core.Servers;
using Core.Utils;
using Core.Utils.Cloners;
@@ -15,7 +16,7 @@ namespace Core.Services;
[Injectable(InjectionType.Singleton)]
public class FenceService(
ILogger logger,
ISptLogger<FenceService> logger,
TimeUtil timeUtil,
RandomUtil randomUtil,
DatabaseService databaseService,
@@ -281,7 +282,7 @@ public class FenceService(
}
else
{
logger.LogWarning($"adjustItemPriceByModifier() - no action taken for item: {item.Template}");
logger.Warning($"adjustItemPriceByModifier() - no action taken for item: {item.Template}");
}
}
@@ -380,7 +381,7 @@ public class FenceService(
if (newRootItem == null)
{
var firstItem = itemWithChildren.FirstOrDefault((x) => x != null);
logger.LogError(
logger.Error(
$"Unable to process fence assort as root item is missing, {firstItem?.Template}, skipping"
);
continue;
@@ -518,7 +519,7 @@ public class FenceService(
{
if (rootItemToAdjust.Upd == null)
{
logger.LogWarning($"Fence Item: {rootItemToAdjust.Template} lacks a Upd object, adding");
logger.Warning($"Fence Item: {rootItemToAdjust.Template} lacks a Upd object, adding");
rootItemToAdjust.Upd = new();
}
@@ -719,7 +720,7 @@ public class FenceService(
.ToList();
if (assortRootItems.Count == 0)
{
logger.LogError("Unable to add assorts to Fence as no root items exist in items being added");
logger.Error("Unable to add assorts to Fence as no root items exist in items being added");
return;
}
@@ -728,7 +729,7 @@ public class FenceService(
var chosenBaseAssortRoot = randomUtil.GetArrayValue(assortRootItems);
if (chosenBaseAssortRoot == null)
{
logger.LogError(localisationService.GetText("fence-unable_to_find_assort_by_id"));
logger.Error(localisationService.GetText("fence-unable_to_find_assort_by_id"));
continue;
}
@@ -1256,7 +1257,7 @@ public class FenceService(
if (modItemToAdjust == null)
{
logger.LogWarning(
logger.Warning(
$"Unable to randomise armor items {armorWithMods[0].Template} ${plateSlot.Name} slot as it cannot be found, skipping"
);
continue;
@@ -1386,7 +1387,7 @@ public class FenceService(
{
if (itemDetails.Properties == null)
{
logger.LogError(
logger.Error(
$"Item {itemDetails.Name} lacks a _props field, unable to randomise item: {itemToAdjust.Id}"
);
return;
@@ -1583,7 +1584,7 @@ public class FenceService(
fenceAssortItem = fenceDiscountAssort.Items.FirstOrDefault((item) => item.Id == assortId);
if (fenceAssortItem == null)
{
logger.LogError(localisationService.GetText("fence-unable_to_find_offer_by_id", assortId));
logger.Error(localisationService.GetText("fence-unable_to_find_offer_by_id", assortId));
return;
}
@@ -1618,7 +1619,7 @@ public class FenceService(
if (indexToRemove == -1)
{
logger.LogWarning(
logger.Warning(
$"unable to remove fence assort item: {itemToRemove.Id} tpl: {itemToRemove.Template}"
);
}