From: Samual Lenks <samual@xonotic.org>
Date: Tue, 5 Mar 2013 07:26:22 +0000 (-0500)
Subject: *sigh*
X-Git-Tag: xonotic-v0.7.0~62^2~16
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1cfbcde83c98c24e235c08f234fd7874d69bedb8;p=xonotic%2Fxonotic-data.pk3dir.git

*sigh*
---

diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index ebe51ff10..6c1e0ed56 100644
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -152,22 +152,23 @@ void ClientCommand_join(float request)
 			{
 				if(self.classname != "player" && !lockteams && !g_arena)
 				{
-/*					if(nJoinAllowed(self)) 
+					if(nJoinAllowed(self)) 
 					{
 						if(g_ca) { self.caplayer = 1; }
 						if(autocvar_g_campaign) { campaign_bots_may_start = 1; }
 						
 						self.classname = "player";
 						PlayerScore_Clear(self);
+						Kill_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER_CPID, CPID_MOTD);
+						Kill_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER_CPID, CPID_PREVENT_JOIN);
 						Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_JOIN_PLAY, self.netname);
 						PutClientInServer();
 					}
 					else 
 					{
 						//player may not join because of g_maxplayers is set
-						Send_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_JOIN_PREVENT);
-					}*/
-					LeaveSpectatorMode();
+						Send_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER_CPID, CPID_PREVENT_JOIN);
+					}
 				}
 			}
 			return; // never fall through to usage