Price/squad-js-map-vote
1
0
Fork 0
mirror of https://github.com/AsgardEternal/squad-js-map-vote.git synced 2025-01-23 20:43:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixed this pointer not being called for getmode

Browse Source
This commit is contained in:
maskedmonkyman 2022-04-23 19:21:07 -07:00
parent 8fea07655d
commit 67d458fa80
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mapvote.js
View File

@ -257,9 +257,9 @@ export default class MapVote extends BasePlugin
while (modes.length > 0) while (modes.length > 0)
{ {
mode = randomElement(this.modes); mode = randomElement(modes);
modes = modes.filter(elem => elem !== mode); modes = modes.filter(elem => elem !== mode);
if (matchLayers(`${mapName}_${mode}`).length > 0) if (this.matchLayers(`${mapName}_${mode}`).length > 0)
break; break;
} }
@ -274,8 +274,12 @@ export default class MapVote extends BasePlugin
const removeCAF = name => name.replace("CAF_", ""); const removeCAF = name => name.replace("CAF_", "");
let layerString = ""; let layerString = "";
let currentMode = "";
if (this.server.currentLayer) if (this.server.currentLayer)
{
layerString = this.server.currentLayer.layerid layerString = this.server.currentLayer.layerid
currentMode = this.server.currentLayer.gamemode
}
this.nominations = []; this.nominations = [];
const rulesList = this.voteRules.rules; const rulesList = this.voteRules.rules;
@ -296,7 +300,7 @@ export default class MapVote extends BasePlugin
for(const nomination of nominationsList) for(const nomination of nominationsList)
{ {
const mapName = nomination.map; const mapName = nomination.map;
let mode = getMode(nomination.modes, this.server.currentLayer.gamemode); let mode = this.getMode(nomination, currentMode);
let version = randomElement(nomination.versions); let version = randomElement(nomination.versions);
let cafPrefix = ""; let cafPrefix = "";
@ -309,7 +313,7 @@ export default class MapVote extends BasePlugin
let builtLayerString = `${cafPrefix}${mapName}_${mode}_${version}`; let builtLayerString = `${cafPrefix}${mapName}_${mode}_${version}`;
if (version === "Any") if (version === "Any")
{ {
let maps = matchLayers(`${mapName}_${mode}`); let maps = this.matchLayers(`${mapName}_${mode}`);
if (maps.length == 0) if (maps.length == 0)
{ {
this.verbose(1, `error: could not find layer for ${builtLayerString} from vote rule \"${layerString}\"`); this.verbose(1, `error: could not find layer for ${builtLayerString} from vote rule \"${layerString}\"`);