diff --git a/extensions/exampleExtension.lua b/extensions/exampleExtension.lua index 1d8bfdf..af404d1 100644 --- a/extensions/exampleExtension.lua +++ b/extensions/exampleExtension.lua @@ -1,5 +1,5 @@ local M = {} -M.COBALT_VERSION = "1.7.4" +M.COBALT_VERSION = "1.7.6" local lastAnnounce = 0 diff --git a/lua/CobaltConfigMngr.lua b/lua/CobaltConfigMngr.lua index bc89352..c35345e 100644 --- a/lua/CobaltConfigMngr.lua +++ b/lua/CobaltConfigMngr.lua @@ -76,19 +76,21 @@ end --IF YOU ARE LOOKING FOR THE CONFIG, PLEASE REFER TO: beamMPserver/Resources/Server/CobaltEssentials/CobaltDB for where the json config is now stored. local defaultConfig = { - commandPrefix = {value = "/", description = "The character placed at the beginning of a chat message when using a command"}, - consolePrefix = {value = "ce ", description = "The text placed at the beginning of a console command"}, - maxActivePlayers = {value = 20, description = "max amount of active/nonspectator players allowed on a server, any further players will be spectator and placed in a queue"}, - enableWhitelist = {value = false, description = "whether or not the whitelist is enabled"}, - enableDebug = {value = false, description = "whether or not the server will output debug messages"}, - enableColors = {value = true, description = "whether or not console outputs can utilize colors. Causes problems with environments missing ANSI escape sequence support. Requires restart"}, - - RCONenabled = {value = true, description = "whether or not the server runs a q3 compliant rcon server for remote access to the server. Requires restart"}, - RCONport = {value = 20814, description = "The port used to host the server. Since CE is external to beamMP make sure to not place this on the same port as the server."}, - RCONpassword = {value = "password", description = "The password required to connect to the RCON"}, - RCONkeepAliveTick = {value = false, description = "The amount of seconds between ticks sent to RCONclients to keep the connections alive, false to disable, This may not work?"}, - - CobaltDBport = {value = 10814, description = "The port used for internal CobaltDB communications, please keep it unique to each server or there may be interference."} + commandPrefix = {value = "/", description = "The character placed at the beginning of a chat message when using a command"}, + consolePrefix = {value = "ce ", description = "The text placed at the beginning of a console command"}, + maxActivePlayers = {value = 20, description = "max amount of active/nonspectator players allowed on a server, any further players will be spectator and placed in a queue"}, + enableWhitelist = {value = false, description = "whether or not the whitelist is enabled"}, + enableDebug = {value = false, description = "whether or not the server will output debug messages"}, + enableColors = {value = true, description = "whether or not console outputs can utilize colors. Causes problems with environments missing ANSI escape sequence support. Requires restart"}, + + RCONenabled = {value = true, description = "whether or not the server runs a q3 compliant rcon server for remote access to the server. Requires restart"}, + RCONport = {value = 20814, description = "The port used to host the server. Since CE is external to beamMP make sure to not place this on the same port as the server."}, + RCONpassword = {value = "password", description = "The password required to connect to the RCON"}, + RCONkeepAliveTick = {value = false, description = "The amount of seconds between ticks sent to RCONclients to keep the connections alive, false to disable, This may not work?"}, + + CobaltDBport = {value = 10814, description = "The port used for internal CobaltDB communications, please keep it unique to each server or there may be interference."}, + + whitelistKickReason = {value = "You are not whitelisted on this server!", description = "The message displayed to the user when they are kicked due to not being whitelisted"} } local defaultPermissions = diff --git a/lua/CobaltPlayerMngr.lua b/lua/CobaltPlayerMngr.lua index 3a06da9..80ea02c 100644 --- a/lua/CobaltPlayerMngr.lua +++ b/lua/CobaltPlayerMngr.lua @@ -237,7 +237,7 @@ local function new(name, role, isGuest, identifiers) --CAN THE PLAYER JOIN? if newPlayer.permissions.whitelisted == false and config.enableWhitelist.value == true then canJoin = false - reason = "You are not whitelisted on this server!" + reason = query("config", "whitelistKickReason", "value"):sub(2, -2) or "You are not whitelisted on this server!" end