From 3d6eaefd8c82c0b255c67e261234e1c477ac5123 Mon Sep 17 00:00:00 2001 From: Chomp Date: Wed, 26 Feb 2025 14:18:38 +0000 Subject: [PATCH] AddPlayerOffers reordering --- .../SptCommands/GiveCommand/GiveSptCommand.cs | 4 +-- .../Core/Services/RagfairOfferService.cs | 26 ++++++++++--------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs b/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs index bd6b7127..678d36b2 100644 --- a/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs +++ b/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs @@ -255,7 +255,7 @@ public class GiveSptCommand( { Id = _hashUtil.Generate(), Template = checkedItem.Value.Id, - Upd = _itemHelper.generateUpdForItem(checkedItem.Value) + Upd = _itemHelper.GenerateUpdForItem(checkedItem.Value) } ); } @@ -266,7 +266,7 @@ public class GiveSptCommand( { Id = _hashUtil.Generate(), Template = checkedItem.Value.Id, - Upd = _itemHelper.generateUpdForItem(checkedItem.Value) + Upd = _itemHelper.GenerateUpdForItem(checkedItem.Value) }; itemToSend.Upd.StackObjectsCount = quantity; try diff --git a/Libraries/Core/Services/RagfairOfferService.cs b/Libraries/Core/Services/RagfairOfferService.cs index 37322c85..f8f64cf5 100644 --- a/Libraries/Core/Services/RagfairOfferService.cs +++ b/Libraries/Core/Services/RagfairOfferService.cs @@ -171,23 +171,25 @@ public class RagfairOfferService( public void AddPlayerOffers() { - if (!_playerOffersLoaded) + if (_playerOffersLoaded) { - foreach (var sessionID in saveServer.GetProfiles().Keys) + return; + } + + foreach (var sessionId in saveServer.GetProfiles().Keys) + { + var pmcData = saveServer.GetProfile(sessionId)?.CharacterData?.PmcData; + + if (pmcData?.RagfairInfo?.Offers == null) + // Profile is wiped { - var pmcData = saveServer.GetProfile(sessionID)?.CharacterData?.PmcData; - - if (pmcData?.RagfairInfo == null || pmcData.RagfairInfo.Offers == null) - // Profile is wiped - { - continue; - } - - ragfairOfferHolder.AddOffers(pmcData.RagfairInfo.Offers); + continue; } - _playerOffersLoaded = true; + ragfairOfferHolder.AddOffers(pmcData.RagfairInfo.Offers); } + + _playerOffersLoaded = true; } public void ExpireStaleOffers()