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

Fix ProbabilityObjectArray.draw returning undefined when the pool is initially empty (!227)

Browse Source 
It now returns an empty array if the pool is initially empty.

This function does not guarantee the number of elements returned because it will break out the loop early if the pool is exhausted.

Co-authored-by: qe201020335 <qe201020335@sina.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/227
Co-authored-by: qe201020335 <qe201020335@noreply.dev.sp-tarkov.com>
Co-committed-by: qe201020335 <qe201020335@noreply.dev.sp-tarkov.com>
This commit is contained in:
qe201020335 2024-02-16 10:12:15 +00:00 committed by chomp
parent 7bc867a8f7
commit a7ae3c3c67
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
project/src/generators/LocationGenerator.ts
View File

@ -638,7 +638,7 @@ export class LocationGenerator
const randomSpawnpointCount = desiredSpawnpointCount - chosenSpawnpoints.length
// only draw random spawn points if needed
if (randomSpawnpointCount > 0)
if (randomSpawnpointCount > 0 && spawnpointArray.length > 0)
{
// Add randomly chosen spawn points
for (const si of spawnpointArray.draw(randomSpawnpointCount, false))

2
project/src/utils/RandomUtil.ts
View File

@ -136,6 +136,8 @@ export class ProbabilityObjectArray<K, V = undefined> extends Array<ProbabilityO
*/
public draw(count = 1, replacement = true, locklist: Array<K> = []): K[]
{
if (this.length === 0) return [];
const { probArray, keyArray } = this.reduce((acc, x) =>
{
acc.probArray.push(x.relativeProbability);