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

Add guard to fillMagazineWithCartridge() to prevent bad mod data breaking server

Browse Source
This commit is contained in:
Dev 2023-12-16 22:23:50 +00:00
parent 66630a5fc6
commit 10b88b54b3
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1028,7 +1028,14 @@ export class ItemHelper
const cartridgeMaxStackSize = cartridgeDetails[1]._props.StackMaxSize; const cartridgeMaxStackSize = cartridgeDetails[1]._props.StackMaxSize;
// Get max number of cartridges in magazine, choose random value between min/max // Get max number of cartridges in magazine, choose random value between min/max
const magazineCartridgeMaxCount = magTemplate._props.Cartridges[0]._max_count; const magazineCartridgeMaxCount = magTemplate._props.Cartridges[0]?._max_count;
if (!magazineCartridgeMaxCount)
{
this.logger.warning(`Magazine: ${magTemplate._id} ${magTemplate._name} lacks a Cartridges array, unable to fill magazine with ammo`);
return;
}
const desiredStackCount = this.randomUtil.getInt( const desiredStackCount = this.randomUtil.getInt(
Math.round(minSizePercent * magazineCartridgeMaxCount), Math.round(minSizePercent * magazineCartridgeMaxCount),
magazineCartridgeMaxCount, magazineCartridgeMaxCount,