In the new message mapper code, fail unconditionally when an entry doesn't match...

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

diff --git a/lib/rbot/messagemapper.rb b/lib/rbot/messagemapper.rb
index ec465e812ed86f77fef494045a6ea9756a114723..f074dd20d319550124840ebdcec1ec3a8dfbe3fc 100644 (file)
--- a/lib/rbot/messagemapper.rb
+++ b/lib/rbot/messagemapper.rb
@@ -346,11 +346,11 @@ module Irc
           if matching[i]
             value = matching[i]
             unless passes_requirements?(item, value)
-              if @defaults.has_key?(item)
-                value == @defaults[item]
-              else
+              # if @defaults.has_key?(item)
+              #   value = @defaults[item]
+              # else
                 return nil, requirements_for(item)
-              end
+              # end
             end
           else
             value = @defaults[item]