From 39ee2324765bad4be8577bc771371aa3d762aa86 Mon Sep 17 00:00:00 2001 From: JustinAJ Date: Tue, 25 Aug 2015 02:22:53 -0400 Subject: [PATCH] General code improvements. --- Release/Plugins/RenX.Core.lib | Bin 134426 -> 134426 bytes RenX.Core/RenX_Server.cpp | 170 ++++++++++++++++------------------ 2 files changed, 78 insertions(+), 92 deletions(-) diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib index 789ca344c45d28a8f7f11884911dc0022dc478ca..e284ec74fc4adabdf4fdee68baec8a7acd601ea0 100644 GIT binary patch delta 8612 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 diff --git a/RenX.Core/RenX_Server.cpp b/RenX.Core/RenX_Server.cpp index 08009a6..1bf4809 100644 --- a/RenX.Core/RenX_Server.cpp +++ b/RenX.Core/RenX_Server.cpp @@ -189,11 +189,7 @@ bool RenX::Server::isPure() const int RenX::Server::send(const Jupiter::ReadableString &command) { - Jupiter::String cmd(command.size() + 2); - cmd = 'c'; - cmd += command; - cmd += '\n'; - return RenX::Server::sock.send(cmd); + return RenX::Server::sock.send("c"_jrs + command + '\n'); } int RenX::Server::sendMessage(const Jupiter::ReadableString &message) @@ -208,24 +204,14 @@ int RenX::Server::sendMessage(const Jupiter::ReadableString &message) return r; } else - { - Jupiter::StringS cmd = STRING_LITERAL_AS_REFERENCE("chostsay "); - cmd += message; - cmd += '\n'; - return RenX::Server::sock.send(cmd); - } + return RenX::Server::sock.send("chostsay "_jrs + message + '\n'); } int RenX::Server::sendMessage(const RenX::PlayerInfo *player, const Jupiter::ReadableString &message) { - Jupiter::String cmd(message.size() + 28); - cmd = STRING_LITERAL_AS_REFERENCE("chostprivatesay pid"); - cmd += Jupiter::StringS::Format("%d ", player->id); - cmd += message; - cmd += '\n'; + auto cmd = "chostprivatesay pid"_jrs + Jupiter::StringS::Format("%d ", player->id) + message + '\n'; RenX::sanitizeString(cmd); return RenX::Server::sock.send(cmd); - //return RenX::Server::sock.send(Jupiter::StringS::Format("chostprivatesay pid%d %.*s\n", player->id, message.size(), message.ptr())); } int RenX::Server::sendData(const Jupiter::ReadableString &data) @@ -471,12 +457,12 @@ bool RenX::Server::updateClientList() bool RenX::Server::updateBuildingList() { RenX::Server::lastBuildingListUpdate = std::chrono::steady_clock::now(); - return RenX::Server::sock.send(STRING_LITERAL_AS_REFERENCE("cbinfo\n")) > 0; + return RenX::Server::sock.send("cbinfo\n"_jrs) > 0; } bool RenX::Server::gameover() { - return RenX::Server::send(STRING_LITERAL_AS_REFERENCE("endmap")) > 0; + return RenX::Server::send("endmap"_jrs) > 0; } bool RenX::Server::setMap(const Jupiter::ReadableString &map) @@ -499,22 +485,22 @@ bool RenX::Server::cancelVote(const RenX::TeamType team) switch (team) { default: - return RenX::Server::send(STRING_LITERAL_AS_REFERENCE("cancelvote -1")) > 0; + return RenX::Server::send("cancelvote -1"_jrs) > 0; case TeamType::GDI: - return RenX::Server::send(STRING_LITERAL_AS_REFERENCE("cancelvote 0")) > 0; + return RenX::Server::send("cancelvote 0"_jrs) > 0; case TeamType::Nod: - return RenX::Server::send(STRING_LITERAL_AS_REFERENCE("cancelvote 1")) > 0; + return RenX::Server::send("cancelvote 1"_jrs) > 0; } } bool RenX::Server::swapTeams() { - return RenX::Server::send(STRING_LITERAL_AS_REFERENCE("swapteams")) > 0; + return RenX::Server::send("swapteams"_jrs) > 0; } bool RenX::Server::recordDemo() { - return RenX::Server::send(STRING_LITERAL_AS_REFERENCE("recorddemo")) > 0; + return RenX::Server::send("recorddemo"_jrs) > 0; } bool RenX::Server::mute(const RenX::PlayerInfo *player) @@ -617,7 +603,7 @@ const Jupiter::ReadableString &RenX::Server::getRules() const void RenX::Server::setRules(const Jupiter::ReadableString &rules) { RenX::Server::rules = rules; - Jupiter::IRC::Client::Config->set(RenX::Server::configSection, STRING_LITERAL_AS_REFERENCE("Rules"), rules); + Jupiter::IRC::Client::Config->set(RenX::Server::configSection, "Rules"_jrs, rules); RenX::Server::sendMessage(Jupiter::StringS::Format("NOTICE: The rules have been modified! Rules: %.*s", rules.size(), rules.ptr())); } @@ -710,8 +696,8 @@ unsigned int RenX::Server::triggerCommand(const Jupiter::ReadableString &trigger if (player->access >= cmd->getAccessLevel()) cmd->trigger(this, player, parameters); else - RenX::Server::sendMessage(player, STRING_LITERAL_AS_REFERENCE("Access Denied.")); - r++; + RenX::Server::sendMessage(player, "Access Denied."_jrs); + ++r; } } return r; @@ -1132,7 +1118,7 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) switch (header) { case 'r': - if (this->lastCommand.equalsi("clientlist")) + if (this->lastCommand.equalsi("clientlist"_jrs)) { // ID | IP | Steam ID | Admin Status | Team | Name if (tokens.tokens[0].isNotEmpty()) @@ -1158,13 +1144,13 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) steamid = steamToken.asUnsignedLongLong(); team = RenX::getTeam(teamToken); - if (adminToken.equalsi("None")) + if (adminToken.equalsi("None"_jrs)) getPlayerOrAdd(tokens.getToken(5), id, team, isBot, steamid, tokens.getToken(1)); else getPlayerOrAdd(tokens.getToken(5), id, team, isBot, steamid, tokens.getToken(1))->adminType = adminToken; } } - else if (this->lastCommand.equalsi("clientvarlist")) + else if (this->lastCommand.equalsi("clientvarlist"_jrs)) { if (this->commandListFormat.token_count == 0) this->commandListFormat = tokens; @@ -1183,50 +1169,50 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) { Jupiter::INIFile::Section::KeyValuePair *pair; - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("Kills")); + pair = table.getPair("Kills"_jrs); if (pair != nullptr) player->kills = pair->getValue().asUnsignedInt(); - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("Deaths")); + pair = table.getPair("Deaths"_jrs); if (pair != nullptr) player->deaths = pair->getValue().asUnsignedInt(); - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("Score")); + pair = table.getPair("Score"_jrs); if (pair != nullptr) player->score = pair->getValue().asDouble(); - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("Credits")); + pair = table.getPair("Credits"_jrs); if (pair != nullptr) player->credits = pair->getValue().asDouble(); - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("Character")); + pair = table.getPair("Character"_jrs); if (pair != nullptr) player->character = pair->getValue(); - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("Vehicle")); + pair = table.getPair("Vehicle"_jrs); if (pair != nullptr) player->vehicle = pair->getValue(); - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("Ping")); + pair = table.getPair("Ping"_jrs); if (pair != nullptr) player->ping = pair->getValue().asUnsignedInt(); - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("Admin")); + pair = table.getPair("Admin"_jrs); if (pair != nullptr) { - if (pair->getValue().equals("None")) + if (pair->getValue().equals("None"_jrs)) player->adminType = ""; else player->adminType = pair->getValue(); } }; - Jupiter::INIFile::Section::KeyValuePair *pair = table.getPair(STRING_LITERAL_AS_REFERENCE("PlayerLog")); + Jupiter::INIFile::Section::KeyValuePair *pair = table.getPair("PlayerLog"_jrs); if (pair != nullptr) - parse(getPlayerOrAdd(Jupiter::ReferenceString::getToken(pair->getValue(), 2, ','), Jupiter::ReferenceString::getToken(pair->getValue(), 1, ',').asInt(), RenX::getTeam(Jupiter::ReferenceString::getToken(pair->getValue(), 0, ',')), false, table.get(STRING_LITERAL_AS_REFERENCE("STEAM")).asUnsignedLongLong(), table.get(STRING_LITERAL_AS_REFERENCE("IP")))); + parse(getPlayerOrAdd(Jupiter::ReferenceString::getToken(pair->getValue(), 2, ','), Jupiter::ReferenceString::getToken(pair->getValue(), 1, ',').asInt(), RenX::getTeam(Jupiter::ReferenceString::getToken(pair->getValue(), 0, ',')), false, table.get("STEAM"_jrs).asUnsignedLongLong(), table.get("IP"_jrs))); else { - Jupiter::INIFile::Section::KeyValuePair *namePair = table.getPair(STRING_LITERAL_AS_REFERENCE("Name")); - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("ID")); + Jupiter::INIFile::Section::KeyValuePair *namePair = table.getPair("Name"_jrs); + pair = table.getPair("ID"_jrs); if (pair != nullptr) { @@ -1235,14 +1221,14 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) { if (player->name.isEmpty()) { - player->name = table.get(STRING_LITERAL_AS_REFERENCE("Name")); + player->name = table.get("Name"_jrs); player->name.processEscapeSequences(); } if (player->ip.isEmpty()) - player->ip = table.get(STRING_LITERAL_AS_REFERENCE("IP")); + player->ip = table.get("IP"_jrs); if (player->steamid == 0) { - uint64_t steamid = table.get(STRING_LITERAL_AS_REFERENCE("STEAM")).asUnsignedLongLong(); + uint64_t steamid = table.get("STEAM"_jrs).asUnsignedLongLong(); if (steamid != 0) { player->steamid = steamid; @@ -1253,12 +1239,12 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) } } - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("TeamNum")); + pair = table.getPair("TeamNum"_jrs); if (pair != nullptr) player->team = RenX::getTeam(pair->getValue().asInt()); else { - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("Team")); + pair = table.getPair("Team"_jrs); if (pair != nullptr) player->team = RenX::getTeam(pair->getValue()); } @@ -1274,10 +1260,10 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) if (player != nullptr) { if (player->ip.isEmpty()) - player->ip = table.get(STRING_LITERAL_AS_REFERENCE("IP")); + player->ip = table.get("IP"_jrs); if (player->steamid == 0) { - uint64_t steamid = table.get(STRING_LITERAL_AS_REFERENCE("STEAM")).asUnsignedLongLong(); + uint64_t steamid = table.get("STEAM"_jrs).asUnsignedLongLong(); if (steamid != 0) { player->steamid = steamid; @@ -1288,12 +1274,12 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) } } - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("TeamNum")); + pair = table.getPair("TeamNum"_jrs); if (pair != nullptr) player->team = RenX::getTeam(pair->getValue().asInt()); else { - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("Team")); + pair = table.getPair("Team"_jrs); if (pair != nullptr) player->team = RenX::getTeam(pair->getValue()); } @@ -1332,37 +1318,37 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) { Jupiter::INIFile::Section::KeyValuePair *pair; - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("Kills")); + pair = table.getPair("Kills"_jrs); if (pair != nullptr) player->kills = pair->getValue().asUnsignedInt(); - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("Deaths")); + pair = table.getPair("Deaths"_jrs); if (pair != nullptr) player->deaths = pair->getValue().asUnsignedInt(); - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("Score")); + pair = table.getPair("Score"_jrs); if (pair != nullptr) player->score = pair->getValue().asDouble(); - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("Credits")); + pair = table.getPair("Credits"_jrs); if (pair != nullptr) player->credits = pair->getValue().asDouble(); - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("Character")); + pair = table.getPair("Character"_jrs); if (pair != nullptr) player->character = pair->getValue(); - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("Vehicle")); + pair = table.getPair("Vehicle"_jrs); if (pair != nullptr) player->vehicle = pair->getValue(); }; - Jupiter::INIFile::Section::KeyValuePair *pair = table.getPair(STRING_LITERAL_AS_REFERENCE("PlayerLog")); + Jupiter::INIFile::Section::KeyValuePair *pair = table.getPair("PlayerLog"_jrs); if (pair != nullptr) parse(getPlayerOrAdd(Jupiter::ReferenceString::getToken(pair->getValue(), 2, ','), Jupiter::ReferenceString::getToken(pair->getValue(), 1, ',').substring(1).asInt(), RenX::getTeam(Jupiter::ReferenceString::getToken(pair->getValue(), 0, ',')), true, 0ULL, Jupiter::ReferenceString::empty)); else { - Jupiter::INIFile::Section::KeyValuePair *namePair = table.getPair(STRING_LITERAL_AS_REFERENCE("Name")); - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("ID")); + Jupiter::INIFile::Section::KeyValuePair *namePair = table.getPair("Name"_jrs); + pair = table.getPair("ID"_jrs); if (pair != nullptr) { @@ -1371,16 +1357,16 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) { if (player->name.isEmpty()) { - player->name = table.get(STRING_LITERAL_AS_REFERENCE("Name")); + player->name = table.get("Name"_jrs); player->name.processEscapeSequences(); } - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("TeamNum")); + pair = table.getPair("TeamNum"_jrs); if (pair != nullptr) player->team = RenX::getTeam(pair->getValue().asInt()); else { - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("Team")); + pair = table.getPair("Team"_jrs); if (pair != nullptr) player->team = RenX::getTeam(pair->getValue()); } @@ -1393,12 +1379,12 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) RenX::PlayerInfo *player = getPlayerByName(namePair->getValue()); if (player != nullptr) { - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("TeamNum")); + pair = table.getPair("TeamNum"_jrs); if (pair != nullptr) player->team = RenX::getTeam(pair->getValue().asInt()); else { - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("Team")); + pair = table.getPair("Team"_jrs); if (pair != nullptr) player->team = RenX::getTeam(pair->getValue()); } @@ -1429,7 +1415,7 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) Jupiter::INIFile::Section::KeyValuePair *pair; RenX::BuildingInfo *building; - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("Building")); + pair = table.getPair("Building"_jrs); if (pair != nullptr) { building = this->getBuildingByName(pair->getValue()); @@ -1440,19 +1426,19 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) building->name = pair->getValue(); } - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("Health")); + pair = table.getPair("Health"_jrs); if (pair != nullptr) building->health = pair->getValue().asInt(10); - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("MaxHealth")); + pair = table.getPair("MaxHealth"_jrs); if (pair != nullptr) building->max_health = pair->getValue().asInt(10); - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("Team")); + pair = table.getPair("Team"_jrs); if (pair != nullptr) building->team = RenX::getTeam(pair->getValue()); - pair = table.getPair(STRING_LITERAL_AS_REFERENCE("Capturable")); + pair = table.getPair("Capturable"_jrs); if (pair != nullptr) building->capturable = pair->getValue().asBool(); } @@ -2638,31 +2624,31 @@ RenX::Server::Server(const Jupiter::ReadableString &configurationSection) void RenX::Server::init() { - RenX::Server::hostname = Jupiter::IRC::Client::Config->get(RenX::Server::configSection, STRING_LITERAL_AS_REFERENCE("Hostname"), STRING_LITERAL_AS_REFERENCE("localhost")); - RenX::Server::port = static_cast(Jupiter::IRC::Client::Config->getInt(RenX::Server::configSection, STRING_LITERAL_AS_REFERENCE("Port"), 7777)); - RenX::Server::clientHostname = Jupiter::IRC::Client::Config->get(RenX::Server::configSection, STRING_LITERAL_AS_REFERENCE("ClientAddress")); - RenX::Server::pass = Jupiter::IRC::Client::Config->get(RenX::Server::configSection, STRING_LITERAL_AS_REFERENCE("Password"), STRING_LITERAL_AS_REFERENCE("renx")); + RenX::Server::hostname = Jupiter::IRC::Client::Config->get(RenX::Server::configSection, "Hostname"_jrs, "localhost"_jrs); + RenX::Server::port = static_cast(Jupiter::IRC::Client::Config->getInt(RenX::Server::configSection, "Port"_jrs, 7777)); + RenX::Server::clientHostname = Jupiter::IRC::Client::Config->get(RenX::Server::configSection, "ClientAddress"_jrs); + RenX::Server::pass = Jupiter::IRC::Client::Config->get(RenX::Server::configSection, "Password"_jrs, "renx"_jrs); - RenX::Server::logChanType = Jupiter::IRC::Client::Config->getShort(RenX::Server::configSection, STRING_LITERAL_AS_REFERENCE("ChanType")); - RenX::Server::adminLogChanType = Jupiter::IRC::Client::Config->getShort(RenX::Server::configSection, STRING_LITERAL_AS_REFERENCE("AdminChanType")); + RenX::Server::logChanType = Jupiter::IRC::Client::Config->getShort(RenX::Server::configSection, "ChanType"_jrs); + RenX::Server::adminLogChanType = Jupiter::IRC::Client::Config->getShort(RenX::Server::configSection, "AdminChanType"_jrs); - RenX::Server::setCommandPrefix(Jupiter::IRC::Client::Config->get(RenX::Server::configSection, STRING_LITERAL_AS_REFERENCE("CommandPrefix"))); - RenX::Server::setPrefix(Jupiter::IRC::Client::Config->get(RenX::Server::configSection, STRING_LITERAL_AS_REFERENCE("IRCPrefix"))); + RenX::Server::setCommandPrefix(Jupiter::IRC::Client::Config->get(RenX::Server::configSection, "CommandPrefix"_jrs)); + RenX::Server::setPrefix(Jupiter::IRC::Client::Config->get(RenX::Server::configSection, "IRCPrefix"_jrs)); - RenX::Server::rules = Jupiter::IRC::Client::Config->get(RenX::Server::configSection, STRING_LITERAL_AS_REFERENCE("Rules"), STRING_LITERAL_AS_REFERENCE("Anarchy!")); - RenX::Server::delay = std::chrono::milliseconds(Jupiter::IRC::Client::Config->getInt(RenX::Server::configSection, STRING_LITERAL_AS_REFERENCE("ReconnectDelay"), 10000)); - RenX::Server::maxAttempts = Jupiter::IRC::Client::Config->getInt(RenX::Server::configSection, STRING_LITERAL_AS_REFERENCE("MaxReconnectAttempts"), -1); - RenX::Server::rconBan = Jupiter::IRC::Client::Config->getBool(RenX::Server::configSection, STRING_LITERAL_AS_REFERENCE("RCONBan"), false); - RenX::Server::localSteamBan = Jupiter::IRC::Client::Config->getBool(RenX::Server::configSection, STRING_LITERAL_AS_REFERENCE("LocalSteamBan"), true); - RenX::Server::localIPBan = Jupiter::IRC::Client::Config->getBool(RenX::Server::configSection, STRING_LITERAL_AS_REFERENCE("LocalIPBan"), true); - RenX::Server::localNameBan = Jupiter::IRC::Client::Config->getBool(RenX::Server::configSection, STRING_LITERAL_AS_REFERENCE("LocalNameBan"), false); + RenX::Server::rules = Jupiter::IRC::Client::Config->get(RenX::Server::configSection, "Rules"_jrs, "Anarchy!"_jrs); + RenX::Server::delay = std::chrono::milliseconds(Jupiter::IRC::Client::Config->getInt(RenX::Server::configSection, "ReconnectDelay"_jrs, 10000)); + RenX::Server::maxAttempts = Jupiter::IRC::Client::Config->getInt(RenX::Server::configSection, "MaxReconnectAttempts"_jrs, -1); + RenX::Server::rconBan = Jupiter::IRC::Client::Config->getBool(RenX::Server::configSection, "RCONBan"_jrs, false); + RenX::Server::localSteamBan = Jupiter::IRC::Client::Config->getBool(RenX::Server::configSection, "LocalSteamBan"_jrs, true); + RenX::Server::localIPBan = Jupiter::IRC::Client::Config->getBool(RenX::Server::configSection, "LocalIPBan"_jrs, true); + RenX::Server::localNameBan = Jupiter::IRC::Client::Config->getBool(RenX::Server::configSection, "LocalNameBan"_jrs, false); RenX::Server::localBan = RenX::Server::localIPBan || RenX::Server::localSteamBan || RenX::Server::localNameBan; - RenX::Server::steamFormat = Jupiter::IRC::Client::Config->getInt(RenX::Server::configSection, STRING_LITERAL_AS_REFERENCE("SteamFormat"), 16); - RenX::Server::neverSay = Jupiter::IRC::Client::Config->getBool(RenX::Server::configSection, STRING_LITERAL_AS_REFERENCE("NeverSay"), false); - RenX::Server::clientUpdateRate = std::chrono::milliseconds(Jupiter::IRC::Client::Config->getInt(RenX::Server::configSection, STRING_LITERAL_AS_REFERENCE("ClientUpdateRate"), 2500)); - RenX::Server::buildingUpdateRate = std::chrono::milliseconds(Jupiter::IRC::Client::Config->getInt(RenX::Server::configSection, STRING_LITERAL_AS_REFERENCE("BuildingUpdateRate"), 7500)); - RenX::Server::pingRate = std::chrono::milliseconds(Jupiter::IRC::Client::Config->getInt(RenX::Server::configSection, STRING_LITERAL_AS_REFERENCE("PingUpdateRate"), 60000)); - RenX::Server::pingTimeoutThreshold = std::chrono::milliseconds(Jupiter::IRC::Client::Config->getInt(RenX::Server::configSection, STRING_LITERAL_AS_REFERENCE("PingTimeoutThreshold"), 10000)); + RenX::Server::steamFormat = Jupiter::IRC::Client::Config->getInt(RenX::Server::configSection, "SteamFormat"_jrs, 16); + RenX::Server::neverSay = Jupiter::IRC::Client::Config->getBool(RenX::Server::configSection, "NeverSay"_jrs, false); + RenX::Server::clientUpdateRate = std::chrono::milliseconds(Jupiter::IRC::Client::Config->getInt(RenX::Server::configSection, "ClientUpdateRate"_jrs, 2500)); + RenX::Server::buildingUpdateRate = std::chrono::milliseconds(Jupiter::IRC::Client::Config->getInt(RenX::Server::configSection, "BuildingUpdateRate"_jrs, 7500)); + RenX::Server::pingRate = std::chrono::milliseconds(Jupiter::IRC::Client::Config->getInt(RenX::Server::configSection, "PingUpdateRate"_jrs, 60000)); + RenX::Server::pingTimeoutThreshold = std::chrono::milliseconds(Jupiter::IRC::Client::Config->getInt(RenX::Server::configSection, "PingTimeoutThreshold"_jrs, 10000)); Jupiter::INIFile &commandsFile = RenX::getCore()->getCommandsFile(); RenX::Server::commandAccessLevels = commandsFile.getSection(RenX::Server::configSection);