470486104/Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reworked buyItem() to use addItemsToStash() to ensure it performs a space check prior to adding any items to stash

Browse Source
This commit is contained in:
Dev 2024-02-05 14:07:21 +00:00
parent 2f673d12b9
commit 183e71370a
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
project/src/helpers/ItemHelper.ts
View File

@ -1395,7 +1395,6 @@ export class ItemHelper
} }
mod._id = idMappings[mod._id]; mod._id = idMappings[mod._id];
if (mod.parentId !== undefined) if (mod.parentId !== undefined)
{ {
mod.parentId = idMappings[mod.parentId]; mod.parentId = idMappings[mod.parentId];

43
project/src/helpers/TradeHelper.ts
View File

@ -7,6 +7,7 @@ import { TraderHelper } from "@spt-aki/helpers/TraderHelper";
import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; import { IPmcData } from "@spt-aki/models/eft/common/IPmcData";
import { Item } from "@spt-aki/models/eft/common/tables/IItem"; import { Item } from "@spt-aki/models/eft/common/tables/IItem";
import { IAddItemDirectRequest } from "@spt-aki/models/eft/inventory/IAddItemDirectRequest"; import { IAddItemDirectRequest } from "@spt-aki/models/eft/inventory/IAddItemDirectRequest";
import { IAddItemsDirectRequest } from "@spt-aki/models/eft/inventory/IAddItemsDirectRequest";
import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse";
import { IProcessBuyTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessBuyTradeRequestData } from "@spt-aki/models/eft/trade/IProcessBuyTradeRequestData";
import { IProcessSellTradeRequestData } from "@spt-aki/models/eft/trade/IProcessSellTradeRequestData"; import { IProcessSellTradeRequestData } from "@spt-aki/models/eft/trade/IProcessSellTradeRequestData";
@ -200,35 +201,43 @@ export class TradeHelper
const itemsToSendTotalCount = buyRequestData.count; const itemsToSendTotalCount = buyRequestData.count;
let itemsToSendRemaining = itemsToSendTotalCount; let itemsToSendRemaining = itemsToSendTotalCount;
// Loop until all items have been sent to player stash // Construct array of items to send to player
const itemsToSendToPlayer: Item[][] = [];
while (itemsToSendRemaining > 0) while (itemsToSendRemaining > 0)
{ {
// Handle edge case when remaining items to send < max stack size const offerClone = this.jsonUtil.clone(offerItems);
// Handle stackable items that have a max stack size limit
const itemCountToSend = Math.min(itemMaxStackSize, itemsToSendRemaining); const itemCountToSend = Math.min(itemMaxStackSize, itemsToSendRemaining);
offerItems[0].upd.StackObjectsCount = itemCountToSend; offerClone[0].upd.StackObjectsCount = itemCountToSend;
// Prevent any collisions // Prevent any collisions
this.itemHelper.remapRootItemId(offerItems); this.itemHelper.remapRootItemId(offerClone);
if (offerClone.length > 1)
// Construct request
const request: IAddItemDirectRequest = {
itemWithModsToAdd: this.itemHelper.reparentItemAndChildren(offerItems[0], offerItems),
foundInRaid: foundInRaid,
callback: buyCallback,
useSortingTable: false,
};
// Add item + children to stash
this.inventoryHelper.addItemToStash(sessionID, request, pmcData, output);
if (output.warnings.length > 0)
{ {
return; this.itemHelper.reparentItemAndChildren(offerClone[0], offerClone);
} }
itemsToSendToPlayer.push(offerClone);
// Remove amount of items added to player stash // Remove amount of items added to player stash
itemsToSendRemaining -= itemCountToSend; itemsToSendRemaining -= itemCountToSend;
} }
// Construct request
const request: IAddItemsDirectRequest = {
itemsWithModsToAdd: itemsToSendToPlayer,
foundInRaid: foundInRaid,
callback: buyCallback,
useSortingTable: false,
};
// Add items + their children to stash
this.inventoryHelper.addItemsToStash(sessionID, request, pmcData, output);
if (output.warnings.length > 0)
{
return;
}
/// Pay for purchase /// Pay for purchase
this.paymentService.payMoney(pmcData, buyRequestData, sessionID, output); this.paymentService.payMoney(pmcData, buyRequestData, sessionID, output);
if (output.warnings.length > 0) if (output.warnings.length > 0)