AsgardEternal/SquadJS
1
0
Fork 0
mirror of https://github.com/AsgardEternal/SquadJS.git synced 2024-09-28 14:04:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

simplify layer info finding for rcon

Browse Source
This commit is contained in:
Skillet 2023-11-18 13:19:46 -05:00
parent 2e5a88127c
commit 8e7795ecaa
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
squad-server/index.js
View File

@ -485,29 +485,8 @@ export default class SquadServer extends EventEmitter {
let rconlayer = await Layers.getLayerByName(currentMap.layer); let rconlayer = await Layers.getLayerByName(currentMap.layer);
if (!rconlayer) rconlayer = await Layers.getLayerById(currentMap.layer); if (!rconlayer) rconlayer = await Layers.getLayerById(currentMap.layer);
if (!rconlayer) rconlayer = await Layers.getLayerByClassname(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; currentLayer = rconlayer;
} }
} }