Cleanup of getOwnerInventoryItems()

This commit is contained in:
Dev 2024-07-09 09:56:18 +01:00
parent bb50998e04
commit 2050880c91

View File

@ -907,17 +907,16 @@ export class InventoryHelper
sessionId: string, sessionId: string,
): IOwnerInventoryItems ): IOwnerInventoryItems
{ {
let isSameInventory = false;
const pmcItems = this.profileHelper.getPmcProfile(sessionId).Inventory.items; const pmcItems = this.profileHelper.getPmcProfile(sessionId).Inventory.items;
const scavData = this.profileHelper.getScavProfile(sessionId); const scavProfile = this.profileHelper.getScavProfile(sessionId);
let fromInventoryItems = pmcItems; let fromInventoryItems = pmcItems;
let fromType = "pmc"; let fromType = "pmc";
if (request.fromOwner) if (request.fromOwner)
{ {
if (request.fromOwner.id === scavData._id) if (request.fromOwner.id === scavProfile._id)
{ {
fromInventoryItems = scavData.Inventory.items; fromInventoryItems = scavProfile.Inventory.items;
fromType = "scav"; fromType = "scav";
} }
else if (request.fromOwner.type.toLocaleLowerCase() === "mail") else if (request.fromOwner.type.toLocaleLowerCase() === "mail")
@ -935,22 +934,19 @@ export class InventoryHelper
let toType = "pmc"; let toType = "pmc";
// Destination is scav inventory, update values // Destination is scav inventory, update values
if (request.toOwner?.id === scavData._id) if (request.toOwner?.id === scavProfile._id)
{ {
toInventoryItems = scavData.Inventory.items; toInventoryItems = scavProfile.Inventory.items;
toType = "scav"; toType = "scav";
} }
// From and To types match, same inventory // From and To types match, same inventory
if (fromType === toType) const movingToSameInventory = fromType === toType;
{
isSameInventory = true;
}
return { return {
from: fromInventoryItems, from: fromInventoryItems,
to: toInventoryItems, to: toInventoryItems,
sameInventory: isSameInventory, sameInventory: movingToSameInventory,
isMail: fromType === "mail", isMail: fromType === "mail",
}; };
} }