From 177a587022c94aa4fbaff762652ce8e6d86f5101 Mon Sep 17 00:00:00 2001 From: terencehill Date: Fri, 9 Jun 2023 16:55:52 +0200 Subject: [PATCH] Fix and improve many ban cvar descriptions --- qcsrc/server/command/banning.qh | 6 +++--- xonotic-server.cfg | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qcsrc/server/command/banning.qh b/qcsrc/server/command/banning.qh index f35e99de2..6e2971f24 100644 --- a/qcsrc/server/command/banning.qh +++ b/qcsrc/server/command/banning.qh @@ -10,9 +10,9 @@ string autocvar_g_ban_sync_uri; bool autocvar_g_ban_telluser = true; string autocvar_g_banned_list; bool autocvar_g_banned_list_idmode; -string autocvar_g_chatban_list; // "List of banned players from chat" -string autocvar_g_playban_list; // "List of banned players from playing (forced to spectate)" -string autocvar_g_voteban_list; // "List of banned players from voting" +string autocvar_g_chatban_list; +string autocvar_g_playban_list; +string autocvar_g_voteban_list; #define GET_BAN_ARG(v, d) if (argc > reason_arg) { if ((v = stof(argv(reason_arg))) != 0) ++reason_arg; else v = d; } else { v = d; } #define GET_BAN_REASON(v, d) if (argc > reason_arg) v = substring(command, argv_start_index(reason_arg), strlen(command) - argv_start_index(reason_arg)); else v = d; diff --git a/xonotic-server.cfg b/xonotic-server.cfg index d1cad0b12..dc5be926d 100644 --- a/xonotic-server.cfg +++ b/xonotic-server.cfg @@ -396,19 +396,19 @@ set sv_waypointsprite_limitedrange 5120 "default maximum viewing distance of way set sv_itemstime 1 "enable networking of time left until respawn for items such as mega health/armor and powerups" // bans -set g_ban_default_bantime 5400 "90 minutes" +set g_ban_default_bantime 5400 "default ban time in seconds" set g_ban_default_masksize 3 "masksize 0 means banning by UID only, 1 means banning by /8 (IPv6: /32) network, 2 means banning by /16 (IPv6: /48) network, 3 means banning by /24 (IPv6: /56) network, 4 means banning by single IP (IPv6: /64 network)" set g_ban_sync_uri "" "sync using this ban list provider (empty string to disable)" -set g_ban_sync_interval 5 "sync every 5 minutes" -set g_ban_sync_trusted_servers "" "request ban lists from these xonotic servers (do not include your own server there, or unbanning may fail)" +set g_ban_sync_interval 5 "sync interval in minutes" +set g_ban_sync_trusted_servers "" "request ban lists from these Xonotic servers (do not include your own server there, or unbanning may fail)" set g_ban_sync_timeout 45 "time out in seconds for the ban sync requests" -set g_ban_sync_trusted_servers_verify 0 "when set to 1, additional bans sent by the servers are ignored, and only bans for the requested IP are used" -set g_ban_telluser 1 "notify the banned player about it when they try to join" -set g_banned_list "" "format: IP remainingtime IP remainingtime ..." +set g_ban_sync_trusted_servers_verify 0 "ignore additional bans sent by the servers, and use only bans for the requested IP" +set g_ban_telluser 1 "notify the banned player they are banned when they try to join" +set g_banned_list "" "list of banned players; player format: IP remainingtime" set g_banned_list_idmode "1" "when set, the IP banning system always uses the ID over the IP address (so a user in a banned IP range can connect if they have a valid signed ID)" -set g_chatban_list "" "list of banned players from chat, format: IP playerkey ..." -set g_playban_list "" "list of banned players from playing (forced to spectate), format: IP playerkey ..." -set g_voteban_list "" "list of banned players from voting, format: IP playerkey ..." +set g_chatban_list "" "list of banned players from chat; player format: IP or playerkey" +set g_playban_list "" "list of banned players from playing (forced to spectate); player format: IP or playerkey" +set g_voteban_list "" "list of banned players from voting; player format: IP or playerkey" // useful vote aliases set timelimit_increment 5 "number of minutes added to the timer when voting for extendmatchtime" -- 2.39.2