Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*grumble grumble*
authornemo
Sun, 24 Nov 2013 22:12:23 -0500
changeset 9716 f1698baccaef
parent 9714 54d756b6dbb1 (current diff)
parent 9715 30a303d226f9 (diff)
child 9717 b8b7ef99a084
*grumble grumble*
--- a/gameServer/HWProtoInRoomState.hs	Sun Nov 24 22:11:55 2013 -0500
+++ b/gameServer/HWProtoInRoomState.hs	Sun Nov 24 22:12:23 2013 -0500
@@ -323,6 +323,7 @@
     maybeClientId <- clientByNick newAdmin
     master <- liftM isMaster thisClient
     serverAdmin <- liftM isAdministrator thisClient
+    thisRoomMasterId <- liftM masterID thisRoom
     let newAdminId = fromJust maybeClientId
     let sameRoom = clientRoom rnc thisClientId == clientRoom rnc newAdminId
     return
@@ -330,6 +331,7 @@
             (master || serverAdmin)
                 && isJust maybeClientId
                 && ((newAdminId /= thisClientId) || (serverAdmin && not master))
+                && (newAdminId /= thisRoomMasterId)
                 && sameRoom]
hedgewars