# HG changeset patch # User unc0rr # Date 1362338709 -14400 # Node ID ea2d32a03ac9283e17de7643469de7f482591cc9 # Parent d77090a8a35ef581f992bcdd471c59346bcfc992 Eh, two players condition seems to make more sense than two clans here diff -r d77090a8a35e -r ea2d32a03ac9 gameServer/HWProtoInRoomState.hs --- a/gameServer/HWProtoInRoomState.hs Sun Mar 03 23:23:41 2013 +0400 +++ b/gameServer/HWProtoInRoomState.hs Sun Mar 03 23:25:09 2013 +0400 @@ -305,14 +305,14 @@ let kickId = fromJust maybeClientId let kickCl = rnc `client` kickId let sameRoom = clientRoom rnc thisClientId == clientRoom rnc kickId - let notOnly2Clans = (length . group . sort . map teamcolor . teams $ rm) > 2 + let notOnly2Players = (length . group . sort . map teamowner . teams $ rm) > 2 return [KickRoomClient kickId | master && isJust maybeClientId && (kickId /= thisClientId) && sameRoom - && ((isNothing $ gameInfo rm) || notOnly2Clans || teamsInGame kickCl == 0) + && ((isNothing $ gameInfo rm) || notOnly2Players || teamsInGame kickCl == 0) ]