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

add nullguards and fix callback

Browse Source
This commit is contained in:
CWX
2025-01-23 13:37:38 +00:00
parent 00bd5b670c
commit 5f8717cf46
4 changed files with 123 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/Core/Helpers/InventoryHelper.cs
+14 -11
View File
@@ -1,3 +1,4 @@
using System.Text.Json;
using System.Text.Json.Serialization;
using Core.Models.Eft.Common;
using Core.Models.Eft.Common.Tables;
@@ -13,6 +14,7 @@ using Core.Services;
using Core.Utils;
using Core.Utils.Cloners;
using SptCommon.Annotations;
using SptCommon.Extensions;
using Product = Core.Models.Eft.ItemEvent.Product;
namespace Core.Helpers;
@@ -76,7 +78,7 @@ public class InventoryHelper(
// Add to player inventory
AddItemToStash(sessionId, addItemRequest, pmcData, output);
if (output.Warnings.Count > 0) return;
if (output.Warnings?.Count > 0) return;
}
}
@@ -116,7 +118,7 @@ public class InventoryHelper(
request.UseSortingTable.GetValueOrDefault(false),
output
);
if (output.Warnings.Count > 0)
if (output.Warnings?.Count > 0)
// Failed to place, error out
return;
@@ -130,14 +132,14 @@ public class InventoryHelper(
try
{
if (request.Callback is not null)
request.Callback(rootItemToAdd.Upd.StackObjectsCount.Value, null, null, null);
request.Callback(rootItemToAdd.Upd.StackObjectsCount.Value);
}
catch (Exception ex)
{
// Callback failed
var message = ex.Message;
_httpResponseUtil.AppendErrorToOutput(output, message);
_logger.Error($"[InventoryHelper]: {ex.Message}");
return;
}
@@ -148,7 +150,7 @@ public class InventoryHelper(
pmcData.Inventory.Items.AddRange(itemWithModsToAddClone);
_logger.Debug(
$"Added ${rootItemToAdd.Upd?.StackObjectsCount ?? 1} item: ${rootItemToAdd.Template} with: ${itemWithModsToAddClone.Count - 1} mods to inventory"
$"Added {rootItemToAdd.Upd?.StackObjectsCount ?? 1} item: {rootItemToAdd.Template} with: {itemWithModsToAddClone.Count - 1} mods to inventory"
);
}
@@ -768,11 +770,12 @@ public class InventoryHelper(
// Check each item in container
foreach (var item in containerItemHash)
{
var itemLocation = item?.Location as ItemLocation;
var location = (JsonElement)item.Location;
var itemLocation = location.ToObject<ItemLocation>();
if (itemLocation is null)
{
// item has no location property
_logger.Error("Unable to find 'location' property on item with id: ${ item._id}, skipping");
_logger.Error($"Unable to find 'location' property on item with id: {item.Id}, skipping");
continue;
}
@@ -793,7 +796,7 @@ public class InventoryHelper(
var rowIndex = itemLocation.Y + y;
var containerRow = container2D[rowIndex.Value];
if (containerRow is null)
_logger.Error("Unable to find container: { containerId} row line: { itemLocation.y + y}");
_logger.Error($"Unable to find container: {containerId} row line: {itemLocation.Y + y}");
// Fill the corresponding cells in the container map to show the slot is taken
Array.Fill(containerRow, 1, itemLocation.X.Value, fW);
@@ -950,7 +953,7 @@ public class InventoryHelper(
/// </summary>
/// <param name="sessionId">Players id</param>
/// <returns>Dictionary of 2 values, horizontal and vertical stash size</returns>
protected Dictionary<int, int> GetPlayerStashSize(string sessionId)
protected List<int> GetPlayerStashSize(string sessionId)
{
var profile = _profileHelper.GetPmcProfile(sessionId);
var stashRowBonus = profile.Bonuses.FirstOrDefault(bonus => bonus.Type == BonusType.StashRows);
@@ -964,7 +967,7 @@ public class InventoryHelper(
{
_logger.Error(_localisationService.GetText("inventory-stash_not_found", stashTPL));
return new Dictionary<int, int>();
return new List<int>();
}
var stashItemDetails = stashItemResult.Value;
@@ -976,7 +979,7 @@ public class InventoryHelper(
// Player has a bonus, apply to vertical size
if (stashRowBonus is not null) stashV += (int)stashRowBonus.Value;
return new Dictionary<int, int> { { stashH.Value, stashV.Value } };
return [stashH.Value, stashV.Value];
}
/// <summary>
Libraries/Core/Helpers/ItemHelper.cs
+3 -1
View File
@@ -1,3 +1,4 @@
using System.Text.Json;
using System.Text.Json.Serialization;
using SptCommon.Annotations;
using Core.Models.Eft.Common;
@@ -8,6 +9,7 @@ using Core.Models.Utils;
using Core.Services;
using Core.Utils;
using Core.Utils.Cloners;
using SptCommon.Extensions;
namespace Core.Helpers;
@@ -2027,7 +2029,7 @@ public class ItemHelper(
Template = item.Template,
ParentId = item.ParentId,
SlotId = item.SlotId,
Location = item.Location,
Location = ((JsonElement)item.Location).ToObject<ItemLocation>(),
Upd = item.Upd,
};
}
Libraries/Core/Helpers/TradeHelper.cs
+103 -119
View File
@@ -56,11 +56,49 @@ public class TradeHelper(
)
{
List<Item> offerItems = [];
Action<double, ProcessBuyTradeRequestData, string, PmcData>? buyCallback = null;
Action<double>? buyCallback;
if (buyRequestData.TransactionId.ToLower() == "ragfair")
{
buyCallback = BuyCallback1;
buyCallback = (buyCount =>
{
var allOffers = _ragfairServer.GetOffers();
// We store ragfair offerid in buyRequestData.item_id
var offerWithItem = allOffers.FirstOrDefault(x => x.Id == buyRequestData.ItemId);
var itemPurchased = offerWithItem.Items.FirstOrDefault();
// Ensure purchase does not exceed trader item limit
var assortHasBuyRestrictions = _itemHelper.HasBuyRestrictions(itemPurchased);
if (assortHasBuyRestrictions)
{
this.checkPurchaseIsWithinTraderItemLimit(
sessionID,
pmcData,
buyRequestData.TransactionId,
itemPurchased,
buyRequestData.ItemId,
buyCount
);
// Decrement trader item count
PurchaseDetails itemPurchaseDetails = new PurchaseDetails()
{
Items =
[
new PurchaseItems()
{
ItemId = buyRequestData.ItemId,
Count = buyCount
}
],
TraderId = buyRequestData.TransactionId
};
_traderHelper.AddTraderPurchasesToPlayerProfile(sessionID, itemPurchaseDetails, itemPurchased);
}
});
// buyCallback = BuyCallback1;
// Get raw offer from ragfair, clone to prevent altering offer itself
var allOffers = _ragfairServer.GetOffers();
var offerWithItemCloned = _cloner.Clone(allOffers.FirstOrDefault(x => x.Id == buyRequestData.ItemId));
@@ -68,7 +106,17 @@ public class TradeHelper(
}
else if (buyRequestData.TransactionId == Traders.FENCE)
{
buyCallback = BuyCallback2;
buyCallback = (buyCount =>
{
// Update assort/flea item values
var traderAssorts = _traderHelper.GetTraderAssortsByTraderId(buyRequestData.TransactionId).Items;
var itemPurchased = traderAssorts.FirstOrDefault(assort => assort.Id == buyRequestData.ItemId);
// Decrement trader item count
itemPurchased.Upd.StackObjectsCount -= buyCount;
_fenceService.AmendOrRemoveFenceOffer(buyRequestData.ItemId, buyCount);
});
var fenceItems = _fenceService.GetRawFenceAssorts().Items;
var rootItemIndex = fenceItems.FindIndex(item => item.Id == buyRequestData.ItemId);
@@ -85,7 +133,57 @@ public class TradeHelper(
}
else
{
buyCallback = BuyCallback3;
buyCallback = (buyCount =>
{
// Update assort/flea item values
var traderAssorts = _traderHelper.GetTraderAssortsByTraderId(buyRequestData.TransactionId).Items;
var itemPurchased = traderAssorts.FirstOrDefault(item => item.Id == buyRequestData.ItemId);
// Ensure purchase does not exceed trader item limit
var assortHasBuyRestrictions = _itemHelper.HasBuyRestrictions(itemPurchased);
if (assortHasBuyRestrictions)
{
// Will throw error if check fails
this.checkPurchaseIsWithinTraderItemLimit(
sessionID,
pmcData,
buyRequestData.TransactionId,
itemPurchased,
buyRequestData.ItemId,
buyCount
);
}
// Check if trader has enough stock
if (itemPurchased.Upd.StackObjectsCount < buyCount)
{
throw new Exception(
$"Unable to purchase {buyCount} items, this would exceed the remaining stock left {itemPurchased.Upd.StackObjectsCount} from the traders assort: {buyRequestData.TransactionId} this refresh"
);
}
// Decrement trader item count
itemPurchased.Upd.StackObjectsCount -= buyCount;
if (assortHasBuyRestrictions)
{
var itemPurchaseDat = new PurchaseDetails()
{
Items = new List<PurchaseItems>()
{
new PurchaseItems()
{
ItemId = buyRequestData.ItemId,
Count = buyCount
}
},
TraderId = buyRequestData.TransactionId
};
_traderHelper.AddTraderPurchasesToPlayerProfile(sessionID, itemPurchaseDat, itemPurchased);
}
});
// Get all trader assort items
var traderItems = _traderAssortHelper.GetAssort(sessionID, buyRequestData.TransactionId).Items;
@@ -151,121 +249,7 @@ public class TradeHelper(
_httpResponseUtil.AppendErrorToOutput(output, errorMessage, BackendErrorCodes.UnknownTradingError);
}
}
public void BuyCallback1(
double buyCount,
ProcessBuyTradeRequestData buyRequestData,
string sessionID,
PmcData pmcData)
{
var allOffers = _ragfairServer.GetOffers();
// We store ragfair offerid in buyRequestData.item_id
var offerWithItem = allOffers.FirstOrDefault(x => x.Id == buyRequestData.ItemId);
var itemPurchased = offerWithItem.Items.FirstOrDefault();
// Ensure purchase does not exceed trader item limit
var assortHasBuyRestrictions = _itemHelper.HasBuyRestrictions(itemPurchased);
if (assortHasBuyRestrictions)
{
this.checkPurchaseIsWithinTraderItemLimit(
sessionID,
pmcData,
buyRequestData.TransactionId,
itemPurchased,
buyRequestData.ItemId,
buyCount
);
// Decrement trader item count
PurchaseDetails itemPurchaseDetails = new PurchaseDetails()
{
Items =
[
new PurchaseItems()
{
ItemId = buyRequestData.ItemId,
Count = buyCount
}
],
TraderId = buyRequestData.TransactionId
};
_traderHelper.AddTraderPurchasesToPlayerProfile(sessionID, itemPurchaseDetails, itemPurchased);
}
}
public void BuyCallback2(
double buyCount,
ProcessBuyTradeRequestData buyRequestData,
string sessionID,
PmcData pmcData)
{
// Update assort/flea item values
var traderAssorts = _traderHelper.GetTraderAssortsByTraderId(buyRequestData.TransactionId).Items;
var itemPurchased = traderAssorts.FirstOrDefault(assort => assort.Id == buyRequestData.ItemId);
// Decrement trader item count
itemPurchased.Upd.StackObjectsCount -= buyCount;
_fenceService.AmendOrRemoveFenceOffer(buyRequestData.ItemId, buyCount);
}
public void BuyCallback3(
double buyCount,
ProcessBuyTradeRequestData buyRequestData,
string sessionID,
PmcData pmcData)
{
// Update assort/flea item values
var traderAssorts = _traderHelper.GetTraderAssortsByTraderId(buyRequestData.TransactionId).Items;
var itemPurchased = traderAssorts.FirstOrDefault(item => item.Id == buyRequestData.ItemId);
// Ensure purchase does not exceed trader item limit
var assortHasBuyRestrictions = _itemHelper.HasBuyRestrictions(itemPurchased);
if (assortHasBuyRestrictions)
{
// Will throw error if check fails
this.checkPurchaseIsWithinTraderItemLimit(
sessionID,
pmcData,
buyRequestData.TransactionId,
itemPurchased,
buyRequestData.ItemId,
buyCount
);
}
// Check if trader has enough stock
if (itemPurchased.Upd.StackObjectsCount < buyCount)
{
throw new Exception(
$"Unable to purchase {buyCount} items, this would exceed the remaining stock left {itemPurchased.Upd.StackObjectsCount} from the traders assort: {buyRequestData.TransactionId} this refresh"
);
}
// Decrement trader item count
itemPurchased.Upd.StackObjectsCount -= buyCount;
if (assortHasBuyRestrictions)
{
var itemPurchaseDat = new PurchaseDetails()
{
Items = new List<PurchaseItems>()
{
new PurchaseItems()
{
ItemId = buyRequestData.ItemId,
Count = buyCount
}
},
TraderId = buyRequestData.TransactionId
};
_traderHelper.AddTraderPurchasesToPlayerProfile(sessionID, itemPurchaseDat, itemPurchased);
}
}
/// <summary>
/// Sell item to trader
/// </summary>
Libraries/Core/Services/PaymentService.cs
+3 -4
View File
@@ -10,7 +10,6 @@ using Core.Models.Spt.Config;
using Core.Models.Utils;
using Core.Servers;
using Core.Utils;
using Product = Core.Models.Eft.ItemEvent.Product;
namespace Core.Services;
@@ -64,13 +63,13 @@ public class PaymentService(
itemRequest.Count = 0;
} else {
// If the item is money, add its count to the currencyAmounts object.
currencyAmounts.TryAdd(item.Template, (currencyAmounts[item.Template] ?? 0) + itemRequest.Count);
currencyAmounts.TryAdd(item.Template, (currencyAmounts.GetValueOrDefault(item.Template, 0)) + itemRequest.Count);
}
} else {
// Used by `SptInsure`
// Handle differently, `id` is the money type tpl
var currencyTpl = itemRequest.Id;
currencyAmounts.TryAdd(currencyTpl, (currencyAmounts[currencyTpl] ?? 0) + itemRequest.Count);
currencyAmounts.TryAdd(currencyTpl, (currencyAmounts.GetValueOrDefault(currencyTpl, 0)) + itemRequest.Count);
}
}
@@ -87,7 +86,7 @@ public class PaymentService(
AddPaymentToOutput(pmcData, currencyTpl.Key, (int)currencyAmount, sessionID, output);
// If there are warnings, exit early.
if (output.Warnings.Count > 0) {
if (output.Warnings?.Count > 0) {
return;
}