Merge pull request #228 from ect0s/JSON-FIX

Attempt Fix vehicle filtering for maps with 0 tanks or helicopters
Team-Silver-Sphere · Feb 13, 2022 · 813aca1 · 813aca1
2 parents 170175f + 5964b37
commit 813aca1
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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
       });