From 9edede4f3a594bb4dd3f028a8dc11d4a177d90fd Mon Sep 17 00:00:00 2001 From: Adam- Date: Thu, 25 Feb 2010 07:12:17 +0000 Subject: Removed OnBotPreLoad event, this is a much better way to prevent multiple of the same bots being loaded git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2796 5417fbe8-f217-4b02-8779-1006273d7864 --- src/core/db_plain.cpp | 4 +++- src/core/ss_main.c | 11 ----------- 2 files changed, 3 insertions(+), 12 deletions(-) (limited to 'src/core') diff --git a/src/core/db_plain.cpp b/src/core/db_plain.cpp index 039f19674..c1c9cdae5 100644 --- a/src/core/db_plain.cpp +++ b/src/core/db_plain.cpp @@ -420,7 +420,9 @@ static void LoadNickAlias(const std::vector ¶ms) static void LoadBotInfo(const std::vector ¶ms) { - BotInfo *bi = new BotInfo(params[0].c_str()); + BotInfo *bi = findbot(params[0]); + if (!bi) + bi = new BotInfo(params[0]); bi->user = sstrdup(params[1].c_str()); bi->host = sstrdup(params[2].c_str()); bi->created = strtol(params[4].c_str(), NULL, 10); diff --git a/src/core/ss_main.c b/src/core/ss_main.c index 8ff8080b9..6405c8858 100644 --- a/src/core/ss_main.c +++ b/src/core/ss_main.c @@ -42,7 +42,6 @@ class SSMain : public Module this->SetPermanent(true); this->AddCommand(cmdTable, new CommandSSHelp()); - ModuleManager::Attach(I_OnBotPreLoad, this); statserv = findbot("StatServ"); if (!statserv) @@ -72,16 +71,6 @@ class SSMain : public Module delete statserv; } } - - void OnBotPreLoad(BotInfo *bi) - { - if (bi->nick == "StatServ") - { - delete statserv; - statserv = bi; - statserv->cmdTable = cmdTable; - } - } }; MODULE_INIT(SSMain) -- cgit