From d6075d6c049a80fe2da339d37fa1a83ec425271b Mon Sep 17 00:00:00 2001 From: Skillet Date: Wed, 26 Apr 2023 08:41:28 -0400 Subject: [PATCH] properly get a list of layers --- squad-server/index.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/squad-server/index.js b/squad-server/index.js index 446fc48..972cc03 100644 --- a/squad-server/index.js +++ b/squad-server/index.js @@ -446,8 +446,8 @@ export default class SquadServer extends EventEmitter { let currentLayer = await Layers.getLayerByName(currentMap.layer); if (!currentLayer) currentLayer = await Layers.getLayerById(currentMap.layer); if (!currentLayer) { - if (currentMap.level === 'Jensens') - currentLayer = await Layers.getLayerByName("Jensen's Training Range"); + if (currentMap.level === "Jensen's") + currentLayer = await Layers.getLayerById('Jensens_Range_ADF-PLA'); } const nextLayer = nextMapToBeVoted ? null : await Layers.getLayerByName(nextMap.layer); @@ -457,6 +457,7 @@ export default class SquadServer extends EventEmitter { } this.currentLayerRcon = currentMap; + Logger.verbose('SquadServer', 1, 'Layer information found to be: ', currentMap.layer); this.currentLayer = currentLayer; this.nextLayer = nextLayer; this.nextLayerToBeVoted = nextMapToBeVoted; @@ -592,6 +593,7 @@ export default class SquadServer extends EventEmitter { name: layid.replace(/_/g, ' '), classname: gl.level, layerid: layid, + modName: gl.mod ? gl.mod : 'Vanilla', map: { name: gl.level },