diff options
| -rw-r--r-- | lib/rbot/botuser.rb | 2 | ||||
| -rw-r--r-- | lib/rbot/irc.rb | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/rbot/botuser.rb b/lib/rbot/botuser.rb index 8fa04fc5..a4bec708 100644 --- a/lib/rbot/botuser.rb +++ b/lib/rbot/botuser.rb @@ -461,7 +461,7 @@ class Bot # Adds a Netmask # def add_netmask(mask) - m = mask.to_irc_netmask(:server => nil,:force => true) + m = mask.to_irc_netmask @netmasks << m if self.autologin? Auth.manager.maskdb.add(self, m) diff --git a/lib/rbot/irc.rb b/lib/rbot/irc.rb index 4ad57d99..58e9f90a 100644 --- a/lib/rbot/irc.rb +++ b/lib/rbot/irc.rb @@ -214,7 +214,6 @@ module Irc h = {} h[:server] = @server if defined?(@server) and @server h[:casemap] = @casemap if defined?(@casemap) and @casemap - h[:casemap] ||= @server.casemap if defined?(@server) and @server return h end @@ -683,7 +682,7 @@ module Irc # Subclasses of Netmask will return a new Netmask, using full_downcase # def to_irc_netmask(opts={}) - if self.class == Netmask and not opts[:force] + if self.class == Netmask return self if fits_with_server_and_casemap?(opts) end return self.full_downcase.to_irc_netmask(server_and_casemap.merge(opts)) |