# HG changeset patch # User unc0rr # Date 1385326994 -14400 # Node ID 30a303d226f94c60fb6776e99f77af9421c6efae # Parent cd1d63c355a60d0b00b97b486b7cfcca7aabecf5 Forbid /delegate to room admin diff -r cd1d63c355a6 -r 30a303d226f9 gameServer/HWProtoInRoomState.hs --- a/gameServer/HWProtoInRoomState.hs Sun Nov 24 14:03:33 2013 -0500 +++ b/gameServer/HWProtoInRoomState.hs Mon Nov 25 01:03:14 2013 +0400 @@ -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]