X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_ca.qc;h=0069de3bcb7ef35805d2f73330ac00ef47fc1eef;hb=616d99d79237801b1764601653995b3afc88448a;hp=5236889adc0bae395e2c533d0d95100fdba3ce89;hpb=8f52b69fc643b74eb46e1db9b908137004f89c7d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/gamemode_ca.qc b/qcsrc/server/mutators/gamemode_ca.qc
index 5236889ad..0069de3bc 100644
--- a/qcsrc/server/mutators/gamemode_ca.qc
+++ b/qcsrc/server/mutators/gamemode_ca.qc
@@ -67,12 +67,15 @@ float CA_GetWinnerTeam()
 #define CA_ALIVE_TEAMS_OK() (CA_ALIVE_TEAMS() == ca_teams)
 float CA_CheckWinner()
 {
+	entity e;
 	if(round_handler_GetEndTime() > 0 && round_handler_GetEndTime() - time <= 0)
 	{
 		Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_ROUND_OVER);
 		Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_ROUND_OVER);
 		allowed_to_spawn = FALSE;
 		round_handler_Init(5, autocvar_g_ca_warmup, autocvar_g_ca_round_timelimit);
+		FOR_EACH_PLAYER(e)
+			nades_Clear(e);
 		return 1;
 	}
 
@@ -95,6 +98,10 @@ float CA_CheckWinner()
 
 	allowed_to_spawn = FALSE;
 	round_handler_Init(5, autocvar_g_ca_warmup, autocvar_g_ca_round_timelimit);
+
+	FOR_EACH_PLAYER(e)
+		nades_Clear(e);
+
 	return 1;
 }
 
@@ -153,7 +160,7 @@ MUTATOR_HOOKFUNCTION(ca_PutClientInServer)
 		{
 			self.caplayer = 0.5;
 			if(IS_REAL_CLIENT(self))
-				sprint(self, "You will join the game in the next round.\n");
+				Send_Notification(NOTIF_ONE_ONLY, self, MSG_INFO, INFO_CA_JOIN_LATE);
 		}
 	}
 	return 1;