diff -r b9b1d74b7fef -r 4ae01eabf611 gameServer/HWProtoInRoomState.hs --- a/gameServer/HWProtoInRoomState.hs Fri Oct 26 19:53:07 2018 +0200 +++ b/gameServer/HWProtoInRoomState.hs Fri Oct 26 19:40:43 2018 +0200 @@ -455,7 +455,14 @@ handleCmd_inRoom ["CALLVOTE", "KICK"] = do cl <- thisClient - return [AnswerClients [sendChan cl] ["CHAT", nickServer, loc "/callvote kick: You need to specify a nickname."]] + rm <- thisRoom + return + [AnswerClients [sendChan cl] ["CHAT", nickServer, + if isJust $ masterID rm then + loc "/callvote kick: This is only allowed in rooms without a room master." + else + loc "/callvote kick: You need to specify a nickname." + ]] handleCmd_inRoom ["CALLVOTE", "KICK", nickname] = do (thisClientId, rnc) <- ask