mirror of
https://github.com/AsgardEternal/SquadJS.git
synced 2024-09-28 11:54:23 -05:00
simplify layer info finding for rcon
This commit is contained in:
parent
2e5a88127c
commit
8e7795ecaa
@ -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;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user