diff -r c19f2387d24f -r 6f119783a1ad gameServer/HWProtoInRoomState.hs --- a/gameServer/HWProtoInRoomState.hs Wed Nov 18 14:12:15 2015 -0500 +++ b/gameServer/HWProtoInRoomState.hs Thu Nov 19 13:30:34 2015 +0300 @@ -175,11 +175,11 @@ ModifyClient (\c -> c{ teamsInGame = teamsInGame c - 1, - clientClan = if teamsInGame c == 1 then Nothing else Just $ anotherTeamClan clNick team r + clientClan = if teamsInGame c == 1 then Nothing else anotherTeamClan clNick team r }) ] where - anotherTeamClan clNick team = teamcolor . fromMaybe (error "CHECKPOINT 011") . find (\t -> (teamowner t == clNick) && (t /= team)) . teams + anotherTeamClan clNick team = liftM teamcolor . find (\t -> (teamowner t == clNick) && (t /= team)) . teams findTeam = find (\t -> tName == teamname t) . teams