X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcommand%2Fsv_cmd.qc;h=edeb571c0dd62f0ec374699f2ac8c82e37233d01;hb=bf5c2d4a98483e1f56f585ec7f22f1bff3c2e954;hp=694b157f77d34f77d3c8ed5ed1d4acddca387803;hpb=3c8d113d1e9e95f7fecc1199d609697e333965ae;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc
index 694b157f7..edeb571c0 100644
--- a/qcsrc/server/command/sv_cmd.qc
+++ b/qcsrc/server/command/sv_cmd.qc
@@ -157,9 +157,6 @@ void GameCommand_mobbutcher(float request)
 				++removed_count;
 			}
 
-			FOR_EACH_PLAYER(head)
-				head.monstercount = 0;
-
 			monsters_total = 0; // reset stats?
 			monsters_killed = 0;
 
@@ -216,6 +213,8 @@ void GameCommand_allspec(float request, float argc)
 			FOR_EACH_REALPLAYER(client)
 			{
 				self = client;
+				if(self.caplayer)
+					self.caplayer = 0;
 				PutObserverInServer();
 				++i;
 			}
@@ -1048,6 +1047,8 @@ void GameCommand_moveplayer(float request, float argc)
 						if(!IS_SPEC(client) && !IS_OBSERVER(client))
 						{
 							self = client;
+							if(self.caplayer)
+								self.caplayer = 0;
 							PutObserverInServer();
 
 							successful = strcat(successful, (successful ? ", " : ""), client.netname);
@@ -1153,9 +1154,10 @@ void GameCommand_nospectators(float request)
 		{
 			blockSpectators = 1;
 			entity plr;
-			FOR_EACH_CLIENT(plr) //give every spectator <g_maxplayers_spectator_blocktime> seconds time to become a player
+			FOR_EACH_REALCLIENT(plr) //give every spectator <g_maxplayers_spectator_blocktime> seconds time to become a player
 			{
 				if(IS_SPEC(plr) || IS_OBSERVER(plr))
+				if(!plr.caplayer)
 				{
 					plr.spectatortime = time;
 					Send_Notification(NOTIF_ONE_ONLY, plr, MSG_INFO, INFO_SPECTATE_WARNING, autocvar_g_maxplayers_spectator_blocktime);