Move Server::#type to a self method
parent
6d5c0239f3
commit
d576bb00f7
|
@ -110,7 +110,7 @@ module Vrobot4::Server
|
|||
|
||||
def load_mod mod
|
||||
mt = Vrobot4::Module.get_module_type(mod)
|
||||
if mt[:server] and mt[:server] != type or
|
||||
if mt[:server] and mt[:server] != self.class.type or
|
||||
mt[:servflags] and mt[:servflags] !~ flags
|
||||
raise ArgumentError, "Module " + mod + " not valid for this server"
|
||||
end
|
||||
|
@ -136,10 +136,6 @@ module Vrobot4::Server
|
|||
@modules.each {|mod| break if mod.on_command m, cnam, argv}
|
||||
end
|
||||
|
||||
def type
|
||||
"Unknown"
|
||||
end
|
||||
|
||||
def flags
|
||||
""
|
||||
end
|
||||
|
@ -174,9 +170,9 @@ module Vrobot4::Server
|
|||
|
||||
@@server_types = {}
|
||||
|
||||
def self.add_server_type t, name
|
||||
@@server_types[name] = t
|
||||
Vrobot4.log :INFO, "added server type:", name
|
||||
def self.add_server_type type
|
||||
@@server_types[type.type] = type
|
||||
Vrobot4.log :INFO, "added server type:", type.type
|
||||
end
|
||||
|
||||
def self.get_server_type s
|
||||
|
|
|
@ -1,7 +1,11 @@
|
|||
require 'discordrb'
|
||||
|
||||
class Sv_Discord < Vrobot4::Server::AudioServer
|
||||
Vrobot4::Server.add_server_type self, "Discord"
|
||||
def self.type
|
||||
"Discord"
|
||||
end
|
||||
|
||||
Vrobot4::Server.add_server_type self
|
||||
|
||||
attr_reader :bot
|
||||
|
||||
|
@ -63,10 +67,6 @@ class Sv_Discord < Vrobot4::Server::AudioServer
|
|||
@bot.run
|
||||
end
|
||||
|
||||
def type
|
||||
"Discord"
|
||||
end
|
||||
|
||||
def flags
|
||||
"AD"
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue