Merge branch 'maint/0.83.4'

2010-09-09 00:02:18 -04:00 · 2010-09-09 00:02:18 -04:00 · efdb2b44c1
parent 0abe22f5d1 154fbc30e9
commit efdb2b44c1
1 changed files with 5 additions and 1 deletions
--- a/plugins/Games/plugin.py
+++ b/plugins/Games/plugin.py
@ -58,7 +58,11 @@ class Games(callbacks.Plugin):
        ten-sided dice.
        """
        (dice, sides) = utils.iter.imap(int, m.groups())
-        if sides < 3:
+        if dice > 1000:
+            irc.error('You can\'t roll more than 1000 dice.')
+        elif sides > 100:
+            irc.error('Dice can\'t have more than 100 sides.')
+        elif sides < 3:
            irc.error('Dice can\'t have fewer than 3 sides.')
        else:
            L = [0] * dice