Revert the Struct.new-related changes because they don't do what we want

diff --git a/data/rbot/plugins/quotes.rb b/data/rbot/plugins/quotes.rb
index 30e341bf81772a2fe459d6415830c4656cadd64e..390b98f7077aa6753ef7a4e5013baeef2cf17fb0 100644 (file)
--- a/data/rbot/plugins/quotes.rb
+++ b/data/rbot/plugins/quotes.rb
@@ -1,6 +1,6 @@
 # GB: Ok, we *really* need to switch to db for this plugin too
 
-Quote = Struct.new("Quote", :num, :date, :source, :quote) unless defined?(Struct::Quote)
+Quote = Struct.new("Quote", :num, :date, :source, :quote)
 
 class QuotePlugin < Plugin
   def initialize

diff --git a/data/rbot/plugins/roulette.rb b/data/rbot/plugins/roulette.rb
index f979274046974c57cdca7c93af18e58b5c8dc74c..e3bb25f6c46ad90b6582617d0114804208863fa9 100644 (file)
--- a/data/rbot/plugins/roulette.rb
+++ b/data/rbot/plugins/roulette.rb
@@ -1,4 +1,4 @@
-RouletteHistory = Struct.new("RouletteHistory", :games, :shots, :deaths, :misses, :wins) unless defined?(Struct::RouletteHistory)
+RouletteHistory = Struct.new("RouletteHistory", :games, :shots, :deaths, :misses, :wins)
 
 class RoulettePlugin < Plugin
   def initialize

diff --git a/data/rbot/plugins/seen.rb b/data/rbot/plugins/seen.rb
index 3c9218382d3413e4cc4dc54f695f23a24137c387..aec5a064fa8ebbd7c990119a71ad87a17ccbecb9 100644 (file)
--- a/data/rbot/plugins/seen.rb
+++ b/data/rbot/plugins/seen.rb
@@ -1,4 +1,4 @@
-Saw = Struct.new("Saw", :nick, :time, :type, :where, :message) unless defined?(Seen::Saw)
+Saw = Struct.new("Saw", :nick, :time, :type, :where, :message)
 
 class SeenPlugin < Plugin
   def help(plugin, topic="")

diff --git a/data/rbot/plugins/url.rb b/data/rbot/plugins/url.rb
index 45949f501f8a90633949de6058e73452b548cc46..b04beb871be52588c98d45145b030eb1fe8d915d 100644 (file)
--- a/data/rbot/plugins/url.rb
+++ b/data/rbot/plugins/url.rb
@@ -2,7 +2,7 @@ require 'net/http'
 require 'uri'
 require 'cgi'
 
-Url = Struct.new("Url", :channel, :nick, :time, :url) unless defined?(Struct::Url)
+Url = Struct.new("Url", :channel, :nick, :time, :url)
 TITLE_RE = /<\s*?title\s*?>(.+?)<\s*?\/title\s*?>/im
 
 UNESCAPE_TABLE = {