From 4bb4a83729d873ee596f05ff1b440ed0f2462868 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Tue, 8 Mar 2022 10:07:14 -0600 Subject: [PATCH] Fix for server settings bitflags --- scripts/server/class.js | 24 ------------------------ scripts/server/config.js | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/scripts/server/class.js b/scripts/server/class.js index c080fa38..a4d92a13 100644 --- a/scripts/server/class.js +++ b/scripts/server/class.js @@ -113,38 +113,14 @@ class ServerData { this.minute = toInteger(dbAssoc["svr_start_time_min"]); this.minuteDuration = toInteger(dbAssoc["svr_time_min_duration"]); this.weather = toInteger(dbAssoc["svr_start_weather"]); - this.fallingSnow = hasBitFlag(this.settings, getServerSettingsFlagValue("FallingSnow")); - this.groundSnow = hasBitFlag(this.settings, getServerSettingsFlagValue("GroundSnow")); - this.useGUI = hasBitFlag(this.settings, getServerSettingsFlagValue("GUI")); this.guiColourPrimary = [toInteger(dbAssoc["svr_gui_col1_r"]), toInteger(dbAssoc["svr_gui_col1_g"]), toInteger(dbAssoc["svr_gui_col1_b"])]; this.guiColourSecondary = [toInteger(dbAssoc["svr_gui_col2_r"]), toInteger(dbAssoc["svr_gui_col2_g"]), toInteger(dbAssoc["svr_gui_col2_b"])]; this.guiTextColourPrimary = [toInteger(dbAssoc["svr_gui_textcol1_r"]), toInteger(dbAssoc["svr_gui_textcol1_g"]), toInteger(dbAssoc["svr_gui_textcol1_b"])]; //this.guiTextColourSecondary = [toInteger(dbAssoc["svr_gui_textcol2_r"]), toInteger(dbAssoc["svr_gui_textcol2_g"]), toInteger(dbAssoc["svr_gui_textcol2_b"])]; - this.showLogo = hasBitFlag(this.settings, getServerSettingsFlagValue("Logo")); this.inflationMultiplier = toFloat(dbAssoc["svr_inflation_multiplier"]); - this.testerOnly = hasBitFlag(this.settings, getServerSettingsFlagValue("Testing")); - - this.antiCheat = { - enabled: hasBitFlag(this.settings, getServerSettingsFlagValue("Anticheat")), - //checkGameScripts: hasBitFlag(this.settings, getServerSettingsFlagValue("CheckGameScripts")), - //gameScriptBlackListEnabled: hasBitFlag(this.settings, getServerSettingsFlagValue("GameScriptBlackList")), - //gameScriptWhiteListEnabled: hasBitFlag(this.settings, getServerSettingsFlagValue("GameScriptWhiteList")), - //gameScriptWhiteList: [], - //gameScriptBlackList: [], - }; this.discordBotToken = intToBool(dbAssoc["svr_discord_bot_token"]); - this.discordEnabled = hasBitFlag(this.settings, getServerSettingsFlagValue("DiscordBot")); - - this.createJobPickups = hasBitFlag(this.settings, getServerSettingsFlagValue("JobPickups")); - this.createBusinessPickups = hasBitFlag(this.settings, getServerSettingsFlagValue("BusinessPickups")); - this.createHousePickups = hasBitFlag(this.settings, getServerSettingsFlagValue("HousePickups")); - this.createJobBlips = hasBitFlag(this.settings, getServerSettingsFlagValue("JobBlips")); - this.createBusinessBlips = hasBitFlag(this.settings, getServerSettingsFlagValue("BusinessBlips")); - this.createHouseBlips = hasBitFlag(this.settings, getServerSettingsFlagValue("HouseBlips")); - this.introMusicURL = dbAssoc["svr_intro_music"]; - this.useRealTime = hasBitFlag(this.settings, getServerSettingsFlagValue("RealTime")); this.realTimeZone = dbAssoc["svr_time_realtime_timezone"]; this.discordConfig = { diff --git a/scripts/server/config.js b/scripts/server/config.js index 7faff6ea..815f7df1 100644 --- a/scripts/server/config.js +++ b/scripts/server/config.js @@ -131,6 +131,22 @@ function loadServerConfigFromId(tempServerId) { if(dbQuery.numRows > 0) { let dbAssoc = fetchQueryAssoc(dbQuery); let tempServerConfigData = new ServerData(dbAssoc); + + tempServerConfigData.fallingSnow = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("FallingSnow")); + tempServerConfigData.groundSnow = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("GroundSnow")); + tempServerConfigData.useGUI = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("GUI")); + tempServerConfigData.showLogo = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("Logo")); + tempServerConfigData.testerOnly = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("Testing")); + tempServerConfigData.discordEnabled = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("DiscordBot")); + tempServerConfigData.createJobPickups = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("JobPickups")); + tempServerConfigData.createBusinessPickups = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("BusinessPickups")); + tempServerConfigData.createHousePickups = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("HousePickups")); + tempServerConfigData.createJobBlips = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("JobBlips")); + tempServerConfigData.createBusinessBlips = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("BusinessBlips")); + tempServerConfigData.createHouseBlips = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("HouseBlips")); + tempServerConfigData.useRealTime = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("RealTime")); + tempServerConfigData.antiCheat.enabled = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("Anticheat")); + freeDatabaseQuery(dbQuery); return tempServerConfigData; }