Merge remote branch 'origin/master' into samual/updatecommands

[xonotic/xonotic.git] / server / server.cfg

diff --git a/server/server.cfg b/server/server.cfg
index 21a8387008f5ae4a472584a382fc9a18949bfea8..3e945588e455d8116b605c86dd0895b5f654d270 100644 (file)
--- a/server/server.cfg
+++ b/server/server.cfg
@@ -166,6 +166,8 @@ sv_weaponstats_file http://www.xonotic.org/weaponbalance/
 //g_ban_sync_uri "http://94.23.21.40/~xonotic/bans/" // sync bans using this ban list provider (disabled by default, uncomment this line to enable)
 //g_ban_sync_trusted_servers "" // accept bans that were initially set on the server IPs listed here (if not set, your bans are just sent to the sync URIs, but no bans are retrieved from there)
 
+//g_spawnshieldtime 1  // time for which players are protected after spawn
+
 
 /////////////////////////////////////////////////////////////////////
 // "Obvious" mutators that are allowed on a "pure" server