From c7d8b81b49fc78c437057a92f888c08b743e0c5c Mon Sep 17 00:00:00 2001 From: ect0s <73128770+ect0s@users.noreply.github.com> Date: Sat, 12 Feb 2022 13:56:21 -0500 Subject: [PATCH] Attempt Fix vehicle filtering for maps with 0 tanks or helicopters 2.12 Squad, some layers have no vehicles, so when reading JSON from the wiki team we reject a promise because no data[t].vehicles property, this sets to empty array before we attempt a filter. Should stop promise rejection during startup --- squad-server/layers/layer.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/squad-server/layers/layer.js b/squad-server/layers/layer.js index e95f0be2..e19fd30b 100644 --- a/squad-server/layers/layer.js +++ b/squad-server/layers/layer.js @@ -2,7 +2,7 @@ export default class Layer { constructor(data) { this.name = data.Name; this.classname = data.levelName; - this.layerid = data.rawName + this.layerid = data.rawName; this.map = { name: data.mapName }; @@ -30,10 +30,10 @@ export default class Layer { spawnDelay: vehicle.delay, respawnDelay: vehicle.respawnTime })), - numberOfTanks: data[t].vehicles.filter((v) => { + numberOfTanks: (data[t].vehicles || []).filter((v) => { return v.icon.match(/tank/); }).length, - numberOfHelicopters: data[t].vehicles.filter((v) => { + numberOfHelicopters: (data[t].vehicles || []).filter((v) => { return v.icon.match(/helo/); }).length });