diff options
| author | Julien Dessaux | 2011-10-01 00:49:49 +0200 |
|---|---|---|
| committer | Julien Dessaux | 2011-10-01 00:49:49 +0200 |
| commit | 7cefea4cbc17dda9cb59b8cb93c81472ce323225 (patch) | |
| tree | 584855f8384790e99a080507aa9916319fd3d658 /Hsbot | |
| parent | Cosmetics. (diff) | |
| download | hsbot-7cefea4cbc17dda9cb59b8cb93c81472ce323225.tar.gz hsbot-7cefea4cbc17dda9cb59b8cb93c81472ce323225.tar.bz2 hsbot-7cefea4cbc17dda9cb59b8cb93c81472ce323225.zip | |
Other cosmetics + version upgrade.
Diffstat (limited to '')
| -rw-r--r-- | Hsbot/Plugin/Duck.hs | 2 | ||||
| -rw-r--r-- | Hsbot/Utils.hs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Hsbot/Plugin/Duck.hs b/Hsbot/Plugin/Duck.hs index 1044591..c630c6a 100644 --- a/Hsbot/Plugin/Duck.hs +++ b/Hsbot/Plugin/Duck.hs @@ -82,7 +82,7 @@ theDuck (DuckArgs channel seconds) = do ducksWaitingForDeath <- if empty then return 0 else liftIO $ modifyMVar ducksMVar (\x -> return (x - shots, x)) _ <- update' statDB . UpdateScore (getSender msg) $ computeScore ducksWaitingForDeath shots - when (and [ ducksWaitingForDeath > 0, shots >= ducksWaitingForDeath ]) $ do + when ((ducksWaitingForDeath > 0) && (shots >= ducksWaitingForDeath)) $ do _ <- liftIO $ takeMVar ducksMVar time <- liftIO $ readMVar timeMVar duckSpawner channel time ducksMVar diff --git a/Hsbot/Utils.hs b/Hsbot/Utils.hs index 821f610..5d5c424 100644 --- a/Hsbot/Utils.hs +++ b/Hsbot/Utils.hs @@ -44,7 +44,7 @@ hasAccess (Just mask) right = where accessMatch :: AccessList -> Bool accessMatch (AccessList amask arights) - | mask == amask = or [Admin `L.elem` arights, right `L.elem` arights] + | mask == amask = (Admin `L.elem` arights) || (right `L.elem` arights) | otherwise = False -- Helpers |