Removed TraderAssortService use TraderHelper.GetTraderAssortsByTraderId

This commit is contained in:
CWX
2025-04-22 14:36:28 +01:00
parent 7de2393dd1
commit 8ba498a4bc
3 changed files with 1 additions and 41 deletions
@@ -19,7 +19,6 @@ public class TraderController(
TimeUtil _timeUtil,
DatabaseService _databaseService,
TraderAssortHelper _traderAssortHelper,
TraderAssortService _traderAssortService,
ProfileHelper _profileHelper,
TraderHelper _traderHelper,
PaymentHelper _paymentHelper,
@@ -65,13 +64,6 @@ public class TraderController(
AdjustTraderItemPrices(trader, _traderConfig.TraderPriceMultiplier);
}
// Create dict of pristine trader assorts on server start
if (_traderAssortService.GetPristineTraderAssort(traderId) == null)
{
var assortsClone = _cloner.Clone(trader.Assort);
_traderAssortService.SetPristineTraderAssort(traderId, assortsClone);
}
_traderPurchasePersisterService.RemoveStalePurchasesFromProfiles(traderId);
// Set to next hour on clock or current time + 60 minutes
@@ -23,7 +23,6 @@ public class TraderAssortHelper(
PaymentHelper _paymentHelper,
RagfairAssortGenerator _ragfairAssortGenerator,
RagfairOfferGenerator _ragfairOfferGenerator,
TraderAssortService _traderAssortService,
LocalisationService _localisationService,
TraderPurchasePersisterService _traderPurchasePersisterService,
TraderHelper _traderHelper,
@@ -225,6 +224,6 @@ public class TraderAssortHelper(
/// <returns>array of Items</returns>
protected List<Item> GetPristineTraderAssorts(string traderId)
{
return _cloner.Clone(_traderAssortService.GetPristineTraderAssort(traderId).Items);
return _cloner.Clone(_traderHelper.GetTraderAssortsByTraderId(traderId).Items);
}
}
@@ -1,31 +0,0 @@
using SPTarkov.Server.Core.Helpers;
using SPTarkov.Server.Core.Models.Eft.Common.Tables;
using SPTarkov.Common.Annotations;
namespace SPTarkov.Server.Core.Services;
[Injectable(InjectionType.Singleton)]
public class TraderAssortService(
TraderHelper _traderHelper)
{
protected readonly Dictionary<string, TraderAssort> _pristineTraderAssorts = new();
public TraderAssort? GetPristineTraderAssort(string traderId)
{
return _traderHelper.GetTraderAssortsByTraderId(traderId);
_pristineTraderAssorts.TryGetValue(traderId, out var result);
return result;
}
/// <summary>
/// Store trader assorts inside a class property
/// </summary>
/// <param name="traderId">Trader id to store assorts against</param>
/// <param name="assort">Assorts to store</param>
public void SetPristineTraderAssort(string traderId, TraderAssort assort)
{
// TODO: remove
//_pristineTraderAssorts[traderId] = assort;
}
}