gameServer/HWProtoInRoomState.hs
changeset 2381 959da8402cac
parent 2352 7eaf82cf0890
child 2403 6c5d504af2ba
--- a/gameServer/HWProtoInRoomState.hs	Sun Sep 13 17:51:25 2009 +0000
+++ b/gameServer/HWProtoInRoomState.hs	Wed Sep 16 12:48:27 2009 +0000
@@ -140,13 +140,13 @@
 
 
 handleCmd_inRoom clID clients rooms ["EM", msg] =
-	if (teamsInGame client > 0) && (isLegalNetCommand msg) then
-		[ModifyRoom (\r -> r{roundMsgs = roundMsgs r |> msg}),
-		AnswerOthersInRoom ["EM", msg]]
+	if (teamsInGame client > 0) && isLegal then
+		(AnswerOthersInRoom ["EM", msg]) : [ModifyRoom (\r -> r{roundMsgs = roundMsgs r |> msg}) | not isKeepAlive]
 	else
 		[]
 	where
 		client = clients IntMap.! clID
+		(isLegal, isKeepAlive) = checkNetCmd msg
 
 handleCmd_inRoom clID clients rooms ["ROUNDFINISHED"] =
 	if isMaster client then