# HG changeset patch # User unc0rr # Date 1447092591 -10800 # Node ID e6e748d021d0fe31df4e068d41d194bc79c27ac9 # Parent dfcbc2639ade200e6a58a3a834fab39b26852944 - Fix check which was supposed to prevent sending same record to different checkers - Remove some dead code in Actions.hs diff -r dfcbc2639ade -r e6e748d021d0 gameServer/Actions.hs --- a/gameServer/Actions.hs Mon Nov 09 18:03:47 2015 +0000 +++ b/gameServer/Actions.hs Mon Nov 09 21:09:51 2015 +0300 @@ -744,10 +744,6 @@ blackList <- liftM (map (recordFileName . fromJust . checkInfo) . filter (isJust . checkInfo)) allClientsS - readyCheckersIds <- io $ do - allci <- allClientsM rnc - filterM (client'sM rnc (isJust . checkInfo)) allci - (cinfo, l) <- io $ loadReplay (fromIntegral p) blackList when (isJust cinfo) $ mapM_ processAction [ diff -r dfcbc2639ade -r e6e748d021d0 gameServer/OfficialServer/GameReplayStore.hs --- a/gameServer/OfficialServer/GameReplayStore.hs Mon Nov 09 18:03:47 2015 +0000 +++ b/gameServer/OfficialServer/GameReplayStore.hs Mon Nov 09 21:09:51 2015 +0300 @@ -38,13 +38,13 @@ pickReplayFile :: Int -> [String] -> IO String pickReplayFile p blackList = do - files <- liftM (filter (\f -> sameProto f && notBlacklisted f)) $ getDirectoryContents "replays" + files <- liftM (filter (\f -> sameProto f && notBlacklisted ("replays/" ++ f))) $ getDirectoryContents "replays" if (not $ null files) then return $ "replays/" ++ head files else return "" where - sameProto = (isSuffixOf ('.' : show p)) + sameProto = isSuffixOf ('.' : show p) notBlacklisted = flip notElem blackList saveReplay :: RoomInfo -> IO ()