From 8e7795ecaaff0315d74364f2979160f8240ab051 Mon Sep 17 00:00:00 2001 From: Skillet Date: Sat, 18 Nov 2023 13:19:46 -0500 Subject: [PATCH] simplify layer info finding for rcon --- squad-server/index.js | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/squad-server/index.js b/squad-server/index.js index e3240a6..9b14780 100644 --- a/squad-server/index.js +++ b/squad-server/index.js @@ -485,29 +485,8 @@ export default class SquadServer extends EventEmitter { let rconlayer = await Layers.getLayerByName(currentMap.layer); if (!rconlayer) rconlayer = await Layers.getLayerById(currentMap.layer); if (!rconlayer) rconlayer = await Layers.getLayerByClassname(currentMap.layer); - if (!rconlayer) { - if (currentMap.layer === "Jensen's Training Range") - rconlayer = await Layers.getLayerById('JensensRange_ADF-PLA') - } - if (!rconlayer) { - const cleanrconmap = currentMap.layer.toLowerCase().replace(/[ _]/gi, ''); - rconlayer = await Layers.getLayerByCondition( - (l) => - cleanrconmap.includes(l.map.name.toLowerCase().replace(/[ _]/gi, '')) && - cleanrconmap.includes(l.gamemode.toLowerCase().replace(/[ _]/gi, '')) && - cleanrconmap.includes(l.version.toLowerCase().replace(/[ _]/gi, '')) && - cleanrconmap.includes(l.modName.toLowerCase().replace(/[ _]/gi, '')) - ); - } - if (!rconlayer) - currentLayer = await Layers.getLayerByCondition( - (l) => - cleanrconmap.includes(l.map.name.toLowerCase().replace(/[ _]/gi, '')) && - cleanrconmap.includes(l.gamemode.toLowerCase().replace(/[ _]/gi, '')) && - cleanrconmap.includes(l.version.toLowerCase().replace(/[ _]/gi, '')) - ); - if (rconlayer && currentMap.layer !== "Jensen's Training Range"){ + if (rconlayer && (currentMap.layer !== "Jensen's Training Range")){ currentLayer = rconlayer; } }