From 31922eb1d2b923221401e5b7d06775f2899f5055 Mon Sep 17 00:00:00 2001
From: "M. Kristall" <mkpdev@gmail.com>
Date: Fri, 26 Mar 2010 03:30:02 +0000
Subject: * Revert revision 1965 and parts of revisions 1962 and 1966 since
 muted players   should be allowed to join/switch teams

---
 src/game/g_cmds.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/game/g_cmds.c')

diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index 097fa836..4a3a1822 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -530,6 +530,10 @@ void Cmd_Team_f( gentity_t *ent )
   else if( oldteam == TEAM_HUMANS )
     humans--;
 
+  // stop team join spam
+  if( level.time - ent->client->pers.teamChangeTime < 1000 )
+    return;
+
   // disallow joining teams during warmup
   if( g_doWarmup.integer && ( ( level.warmupTime - level.time ) / 1000 ) > 0 )
   {
@@ -2872,7 +2876,7 @@ commands_t cmds[ ] = {
   { "score", CMD_INTERMISSION, ScoreboardMessage },
   { "sell", CMD_HUMAN|CMD_LIVING, Cmd_Sell_f },
   { "setviewpos", CMD_CHEAT_TEAM, Cmd_SetViewpos_f },
-  { "team", CMD_MESSAGE, Cmd_Team_f },
+  { "team", 0, Cmd_Team_f },
   { "teamvote", CMD_TEAM, Cmd_Vote_f },
   { "test", CMD_CHEAT, Cmd_Test_f },
   { "unignore", 0, Cmd_Ignore_f },
-- 
cgit