# HG changeset patch
# User nemo
# Date 1385349143 18000
# Node ID f1698baccaefb4a27eef0c97ad1bfd50396ec2cc
# Parent  54d756b6dbb15a647e7bd01f7dd41b9830515305# Parent  30a303d226f94c60fb6776e99f77af9421c6efae
*grumble grumble*

diff -r 54d756b6dbb1 -r f1698baccaef gameServer/HWProtoInRoomState.hs
--- 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]