gameServer/HWProtoInRoomState.hs
changeset 10057 795f5f918c8c
parent 10040 4ac87acbaed9
child 10058 4ed428389c4e
equal deleted inserted replaced
10056:cb9e07753802 10057:795f5f918c8c
   350     let sameRoom = clientRoom rnc thisClientId == clientRoom rnc newAdminId
   350     let sameRoom = clientRoom rnc thisClientId == clientRoom rnc newAdminId
   351     return
   351     return
   352         [ChangeMaster (Just newAdminId) |
   352         [ChangeMaster (Just newAdminId) |
   353             (master || serverAdmin)
   353             (master || serverAdmin)
   354                 && isJust maybeClientId
   354                 && isJust maybeClientId
   355                 && ((newAdminId /= thisClientId) || (serverAdmin && not master))
       
   356                 && (Just newAdminId /= thisRoomMasterId)
   355                 && (Just newAdminId /= thisRoomMasterId)
   357                 && sameRoom]
   356                 && sameRoom]
   358 
   357 
   359 
   358 
   360 handleCmd_inRoom ["TEAMCHAT", msg] = do
   359 handleCmd_inRoom ["TEAMCHAT", msg] = do