spt/server
spt/server
0
0
Fork 0
mirror of https://github.com/sp-tarkov/server.git synced 2025-02-13 07:50:45 -05:00
Code

Fixed payForClothingItems removing entire stack of currency when purchasing clothing

Browse Source
This commit is contained in:
Chomp 2025-01-29 23:20:04 +00:00
parent 610d486c58
commit a0c0ef2f2b
1 changed files with 18 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
project/src/controllers/CustomizationController.ts
View File

@ -17,11 +17,13 @@ import type {
} from "@spt/models/eft/customization/ICustomizationSetRequest"; } from "@spt/models/eft/customization/ICustomizationSetRequest";
import type { IHideoutCustomisation } from "@spt/models/eft/hideout/IHideoutCustomisation"; import type { IHideoutCustomisation } from "@spt/models/eft/hideout/IHideoutCustomisation";
import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse"; import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData";
import type { ILogger } from "@spt/models/spt/utils/ILogger"; import type { ILogger } from "@spt/models/spt/utils/ILogger";
import { EventOutputHolder } from "@spt/routers/EventOutputHolder"; import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
import { SaveServer } from "@spt/servers/SaveServer"; import { SaveServer } from "@spt/servers/SaveServer";
import { DatabaseService } from "@spt/services/DatabaseService"; import { DatabaseService } from "@spt/services/DatabaseService";
import { LocalisationService } from "@spt/services/LocalisationService"; import { LocalisationService } from "@spt/services/LocalisationService";
import { PaymentService } from "@spt/services/PaymentService";
import type { ICloner } from "@spt/utils/cloners/ICloner"; import type { ICloner } from "@spt/utils/cloners/ICloner";
import { inject, injectable } from "tsyringe"; import { inject, injectable } from "tsyringe";
@ -39,6 +41,7 @@ export class CustomizationController {
@inject("SaveServer") protected saveServer: SaveServer, @inject("SaveServer") protected saveServer: SaveServer,
@inject("LocalisationService") protected localisationService: LocalisationService, @inject("LocalisationService") protected localisationService: LocalisationService,
@inject("ProfileHelper") protected profileHelper: ProfileHelper, @inject("ProfileHelper") protected profileHelper: ProfileHelper,
@inject("PaymentService") protected paymentService: PaymentService,
@inject("PrimaryCloner") protected cloner: ICloner, @inject("PrimaryCloner") protected cloner: ICloner,
) {} ) {}
@ -153,68 +156,21 @@ export class CustomizationController {
output: IItemEventRouterResponse, output: IItemEventRouterResponse,
): void { ): void {
for (const inventoryItemToProcess of itemsToPayForClothingWith) { for (const inventoryItemToProcess of itemsToPayForClothingWith) {
this.payForClothingItem(sessionId, pmcData, inventoryItemToProcess, output); const request: IProcessBuyTradeRequestData = {
} scheme_items: [
} {
id: inventoryItemToProcess.id,
/** count: inventoryItemToProcess.count,
* Update output object and player profile with purchase details for single piece of clothing },
* @param sessionId Session id ],
* @param pmcData Player profile tid: "5ac3b934156ae10c4430e83c",
* @param paymentItemDetails Payment details Action: "buy_from_trader",
* @param output Client response type: "",
*/ item_id: "",
protected payForClothingItem( count: 0,
sessionId: string, scheme_id: 0,
pmcData: IPmcData,
paymentItemDetails: IPaymentItemForClothing,
output: IItemEventRouterResponse,
): void {
const inventoryItem = pmcData.Inventory.items.find((x) => x._id === paymentItemDetails.id);
if (!inventoryItem) {
this.logger.error(
this.localisationService.getText(
"customisation-unable_to_find_clothing_item_in_inventory",
paymentItemDetails.id,
),
);
return;
}
if (paymentItemDetails.del) {
output.profileChanges[sessionId].items.del.push(inventoryItem);
pmcData.Inventory.items.splice(pmcData.Inventory.items.indexOf(inventoryItem), 1);
}
// No upd, add a default
inventoryItem.upd ||= {
StackObjectsCount: 1,
}; };
this.paymentService.payMoney(pmcData, request, sessionId, output);
// Nullguard
if (typeof inventoryItem.upd.StackObjectsCount === "undefined") {
inventoryItem.upd.StackObjectsCount = 1;
}
// Needed count to buy is same as current stack
if (inventoryItem.upd.StackObjectsCount === paymentItemDetails.count) {
output.profileChanges[sessionId].items.del.push(inventoryItem);
pmcData.Inventory.items.splice(pmcData.Inventory.items.indexOf(inventoryItem), 1);
return;
}
if (inventoryItem.upd.StackObjectsCount > paymentItemDetails.count) {
inventoryItem.upd.StackObjectsCount -= paymentItemDetails.count;
output.profileChanges[sessionId].items.change.push({
_id: inventoryItem._id,
_tpl: inventoryItem._tpl,
parentId: inventoryItem.parentId,
slotId: inventoryItem.slotId,
location: inventoryItem.location,
upd: { StackObjectsCount: inventoryItem.upd.StackObjectsCount },
});
} }
} }