diff --git a/source/main.rb b/source/main.rb index 546fc51..edd3ce3 100644 --- a/source/main.rb +++ b/source/main.rb @@ -6,28 +6,19 @@ require 'yaml' module Vrobot4 private - def self.loadServer servinfo - type = servinfo["type"] + def self.loadBot botinfo + type = botinfo["type"] + serv = Server::get_server_type(type).new(botinfo) - serv = Server::get_server_type(type).new(servinfo) - - servinfo["modules"].each \ - {|mod| serv.load_mod mod} if servinfo.key? "modules" + botinfo["modules"].each \ + {|mod| serv.load_mod mod} if botinfo.key? "modules" serv end - def self.loadBot botinfo - servers = [] - botinfo["servers"].each {|servinfo| servers << loadServer(servinfo)} - {info: botinfo, servs: servers} - end - def self.runBots bots thrds = [] - bots.each do |bot| - bot[:servs].each {|serv| thrds << Thread.new {serv.connect}} - end + bots.each {|serv| thrds << Thread.new {serv.connect}} thrds.each {|th| th.join} end