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

Fixed calculateItemWorth() not handling child items lacking a upd object

Browse Source
This commit is contained in:
Dev 2024-08-11 18:33:24 +01:00
parent 0a229d78be
commit ebe1bc021f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
project/src/services/RagfairTaxService.ts
View File

@ -1,4 +1,5 @@
import { ItemHelper } from "@spt/helpers/ItemHelper"; import { ItemHelper } from "@spt/helpers/ItemHelper";
import { ProfileHelper } from "@spt/helpers/ProfileHelper";
import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IPmcData } from "@spt/models/eft/common/IPmcData";
import { Item } from "@spt/models/eft/common/tables/IItem"; import { Item } from "@spt/models/eft/common/tables/IItem";
import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"; import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
@ -8,7 +9,6 @@ import { ILogger } from "@spt/models/spt/utils/ILogger";
import { DatabaseService } from "@spt/services/DatabaseService"; import { DatabaseService } from "@spt/services/DatabaseService";
import { RagfairPriceService } from "@spt/services/RagfairPriceService"; import { RagfairPriceService } from "@spt/services/RagfairPriceService";
import { inject, injectable } from "tsyringe"; import { inject, injectable } from "tsyringe";
import { ProfileHelper } from "@spt/helpers/ProfileHelper";
@injectable() @injectable()
export class RagfairTaxService { export class RagfairTaxService {
@ -80,7 +80,10 @@ export class RagfairTaxService {
itemPriceMult = 4 ** itemPriceMult; itemPriceMult = 4 ** itemPriceMult;
requirementPriceMult = 4 ** requirementPriceMult; requirementPriceMult = 4 ** requirementPriceMult;
const hideoutFleaTaxDiscountBonusSum = this.profileHelper.getBonusValueFromProfile(pmcData,BonusType.RAGFAIR_COMMISSION); const hideoutFleaTaxDiscountBonusSum = this.profileHelper.getBonusValueFromProfile(
pmcData,
BonusType.RAGFAIR_COMMISSION,
);
const taxDiscountPercent = (hideoutFleaTaxDiscountBonusSum + 100) / 100.0; const taxDiscountPercent = (hideoutFleaTaxDiscountBonusSum + 100) / 100.0;
const tax = const tax =
@ -125,7 +128,7 @@ export class RagfairTaxService {
worth += this.calculateItemWorth( worth += this.calculateItemWorth(
child, child,
this.itemHelper.getItem(child._tpl)[1], this.itemHelper.getItem(child._tpl)[1],
child.upd!.StackObjectsCount!, child.upd?.StackObjectsCount ?? 1,
pmcData, pmcData,
false, false,
); );