sheepy-clone: comparison gameServer/HWProtoInRoomState.hs

equal deleted inserted replaced

-:cd007c1780e7
+:8113afd3858f
 import Data.List as L
 import Data.Maybe
 import qualified Data.ByteString.Char8 as B
 import Control.Monad
 import Control.Monad.Reader
+import Control.DeepSeq
 --------------------------------------
 import CoreTypes
 import Actions
 import Utils
 import HandlerUtils
 return [AnswerClients chans ["EM", engineMsg cl]]
 where
 engineMsg cl = toEngineMsg $ B.concat ["b", nick cl, "(team): ", msg, "\x20\x20"]
 handleCmd_inRoom ["BAN", banNick] = do
-(_, rnc) <- ask
+(thisClientId, rnc) <- ask
 maybeClientId <- clientByNick banNick
+master <- liftM isMaster thisClient
 let banId = fromJust maybeClientId
-master <- liftM isMaster thisClient
+let sameRoom = clientRoom rnc thisClientId == clientRoom rnc banId
-return [ModifyRoom (\r -> r{roomBansList = (host $ rnc `client` banId) : roomBansList r}) | master && isJust maybeClientId]
+if master && isJust maybeClientId && (banId /= thisClientId) && sameRoom then
+return [
+ModifyRoom (\r -> r{roomBansList = let h = host $ rnc `client` banId in h `deepseq` h : roomBansList r})
+, KickRoomClient banId
+]
+else
+return []
 handleCmd_inRoom ["LIST"] = return [] -- for old clients (<= 0.9.17)
 handleCmd_inRoom (s:_) = return [ProtocolError $ "Incorrect command '" `B.append` s `B.append` "' (state: in room)"]