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

Improve nullguard code inside findAndAddRandomPresetToLoot()

Browse Source
This commit is contained in:
Dev 2023-08-05 14:50:05 +01:00
parent 5a3326189d
commit 9dd2d3cd04
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
project/src/generators/LootGenerator.ts
View File

@ -218,7 +218,20 @@ export class LootGenerator
{ {
// Choose random preset and get details from item.json using encyclopedia value (encyclopedia === tplId) // Choose random preset and get details from item.json using encyclopedia value (encyclopedia === tplId)
const randomPreset = this.randomUtil.getArrayValue(globalDefaultPresets)[1]; const randomPreset = this.randomUtil.getArrayValue(globalDefaultPresets)[1];
const itemDetails = this.databaseServer.getTables().templates.items[randomPreset._encyclopedia]; if (!randomPreset?._encyclopedia)
{
this.logger.error(`Airdrop - preset with id: ${randomPreset._id} lacks encyclopedia property`);
return false;
}
const itemDetails = this.itemHelper.getItem(randomPreset._encyclopedia);
if (!itemDetails[0])
{
this.logger.error(`Airdrop - Unable to find preset with tpl: ${randomPreset._encyclopedia}`);
return false;
}
// Skip blacklisted items // Skip blacklisted items
if (itemBlacklist.includes(randomPreset._items[0]._tpl)) if (itemBlacklist.includes(randomPreset._items[0]._tpl))
@ -227,15 +240,15 @@ export class LootGenerator
} }
// Some custom mod items are lacking a parent property // Some custom mod items are lacking a parent property
if (!itemDetails._parent) if (!itemDetails[1]._parent)
{ {
this.logger.error(this.localisationService.getText("loot-item_missing_parentid", itemDetails._name)); this.logger.error(this.localisationService.getText("loot-item_missing_parentid", itemDetails[1]?._name));
return false; return false;
} }
// Check picked preset hasn't exceeded spawn limit // Check picked preset hasn't exceeded spawn limit
const itemLimitCount = itemTypeCounts[itemDetails._parent]; const itemLimitCount = itemTypeCounts[itemDetails[1]._parent];
if (itemLimitCount && itemLimitCount.current > itemLimitCount.max) if (itemLimitCount && itemLimitCount.current > itemLimitCount.max)
{ {
return false; return false;

3
project/src/models/eft/common/tables/IItem.ts
View File

@ -16,7 +16,8 @@ export interface Upd
Togglable?: Togglable Togglable?: Togglable
Map?: Map Map?: Map
Tag?: Tag Tag?: Tag
sptPresetId?: string // SPT specific property, not made by BSG /** SPT specific property, not made by BSG */
sptPresetId?: string
FaceShield?: FaceShield FaceShield?: FaceShield
StackObjectsCount?: number StackObjectsCount?: number
UnlimitedCount?: boolean UnlimitedCount?: boolean