Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir

diff --combined qcsrc/server/cl_client.qc
index 8c517d843c9d3933246fa16e8c53c8edcec6c4cd,c212af6bc0449d61c863576040464bf3c7bb4dcd..74494eed5dbc2d97de4f9bc2ff804ee0fd56a0cb
--- 1/qcsrc/server/cl_client.qc
--- 2/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -2460,6 -2460,7 +2460,7 @@@ void ShowRespawnCountdown(
        }
  }
  
+ .float prevent_join_msgtime;
  void LeaveSpectatorMode()
  {
        if(nJoinAllowed(1)) {
@@@ -2481,6 -2482,12 +2482,12 @@@
                        if (time < self.jointime + autocvar_welcome_message_time)
                                Send_CSQC_Centerprint_Generic_Expire(self, CPID_MOTD); // clear MOTD
  
+                       if (self.prevent_join_msgtime)
+                       {
+                               Send_CSQC_Centerprint_Generic_Expire(self, CPID_PREVENT_JOIN);
+                               self.prevent_join_msgtime = 0;
+                       }
+ 
                        return;
                } else {
                        if (g_ca && self.caplayer) {
@@@ -2492,7 -2499,11 +2499,11 @@@
        }
        else {
                //player may not join because of g_maxplayers is set
-               centerprint(self, PREVENT_JOIN_TEXT);
+               if (time - self.prevent_join_msgtime > 2)
+               {
+                       Send_CSQC_Centerprint_Generic(self, CPID_PREVENT_JOIN, PREVENT_JOIN_TEXT, 0, 0);
+                       self.prevent_join_msgtime = time;
+               }
        }
  }
  
@@@ -2603,7 -2614,7 +2614,7 @@@ void ObserverThink(
                        }
                }
        }
-       
+ 
        PrintWelcomeMessage();
  }
  
@@@ -2762,7 -2773,7 +2773,7 @@@ void PlayerPreThink (void
        self.usekeypressed = self.BUTTON_USE;
  
        PrintWelcomeMessage();
-       
+ 
        if(self.classname == "player") {
  //            if(self.netname == "Wazat")
  //                    bprint(self.classname, "\n");
@@@ -3152,7 -3163,7 +3163,7 @@@ void PlayerPostThink (void
  
        CheatFrame();
  
 -      CheckPlayerJump();
 +      //CheckPlayerJump();
  
        if(self.classname == "player") {
                CheckRules_Player();