load rubygems if available

[user/henk/code/ruby/rbot.git] / lib / rbot / timer.rb

diff --git a/lib/rbot/timer.rb b/lib/rbot/timer.rb
index f68e490aefcd8a3a3711204208820655632c5549..8e2a6a4a656476c2ab01bbca12cbaa863ebf135c 100644 (file)
--- a/lib/rbot/timer.rb
+++ b/lib/rbot/timer.rb
@@ -62,7 +62,7 @@ class Timer
       @repeat = opts[:repeat] if opts.include? :repeat
 
       if block_given?
-        @block = block 
+        @block = block
       elsif opts[:code]
         @block = opts[:code]
       end
@@ -248,7 +248,7 @@ class Timer
       @actions.delete k unless a.next
     end
 
-    nxt = @actions.values.map { |v| v.next }.min
+    nxt = @actions.values.find_all { |v| !v.blocked? }.map{ |v| v.next }.min
 
     if nxt
       delta = nxt - now