Reorder some stuff in Init & the ts6 proto mods to fix weirdness from bots being introduced by 3rd party modules

1 files changed, 10 insertions, 0 deletions

diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp
index 6586044aa..23924a2cc 100644
--- a/modules/protocol/inspircd20.cpp
+++ b/modules/protocol/inspircd20.cpp
@@ -771,6 +771,16 @@ class ProtoInspIRCd : public Module
 
 		Implementation i[] = { I_OnUserNickChange, I_OnServerSync };
 		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
+
+		if (Config->Numeric.empty())
+		{
+			Anope::string numeric = ts6_sid_retrieve();
+			Me->SetSID(numeric);
+			Config->Numeric = numeric;
+		}
+
+		for (botinfo_map::iterator it = BotListByNick.begin(), it_end = BotListByNick.end(); it != it_end; ++it)
+			it->second->GenerateUID();
 	}
 
 	~ProtoInspIRCd()