diff --git a/src/network/protocols/server_lobby.cpp b/src/network/protocols/server_lobby.cpp index c60e8cfc4..ec5f49fe3 100644 --- a/src/network/protocols/server_lobby.cpp +++ b/src/network/protocols/server_lobby.cpp @@ -2029,7 +2029,7 @@ std::pair ServerLobby::getHitCaptureLimit(float num_karts) if (ServerConfig::m_hit_limit_threshold > 0.0f) { float val = fminf(num_karts * - ServerConfig::m_hit_limit_threshold, 40.0f); + ServerConfig::m_hit_limit_threshold, 30.0f); hit_capture_limit = (int)val; if (hit_capture_limit == 0) hit_capture_limit = 1; diff --git a/src/network/server_config.hpp b/src/network/server_config.hpp index 51350a5cb..c700f39b7 100644 --- a/src/network/server_config.hpp +++ b/src/network/server_config.hpp @@ -171,7 +171,7 @@ namespace ServerConfig "kick any players.")); SERVER_CFG_PREFIX FloatServerConfigParam m_start_game_counter - SERVER_CFG_DEFAULT(FloatServerConfigParam(30.0f, "start-game-counter", + SERVER_CFG_DEFAULT(FloatServerConfigParam(60.0f, "start-game-counter", "Time to wait before entering kart selection screen " "if satisfied min-start-game-players below for owner less or ranked " "server.")); @@ -211,9 +211,9 @@ namespace ServerConfig "returning to its own base.")); SERVER_CFG_PREFIX FloatServerConfigParam m_hit_limit_threshold - SERVER_CFG_DEFAULT(FloatServerConfigParam(5.0f, "hit-limit-threshold", + SERVER_CFG_DEFAULT(FloatServerConfigParam(3.0f, "hit-limit-threshold", "Value used to calculate hit limit in free for all, which " - "is min(number of players * hit-limit-threshold, 40), " + "is min(number of players * hit-limit-threshold, 30), " "negative value to disable hit limit.")); SERVER_CFG_PREFIX FloatServerConfigParam m_time_limit_threshold_ffa