Fix issues with 'Me' related to previous commit

5 files changed, 3 insertions, 18 deletions

diff --git a/modules/commands/os_dns.cpp b/modules/commands/os_dns.cpp
index c71b1f887..0590bd704 100644
--- a/modules/commands/os_dns.cpp
+++ b/modules/commands/os_dns.cpp
@@ -686,7 +686,7 @@ class ModuleDNS : public Module
 
 	void OnNewServer(Server *s) anope_override
 	{
-		if (s == Me || s->IsJuped())
+		if (Me == NULL || s == Me || s->IsJuped())
 			return;
 		if (!Me->IsSynced() || this->readd_connected_servers)
 		{
diff --git a/modules/protocol/hybrid.cpp b/modules/protocol/hybrid.cpp
index 93f4c53c8..41c1a37f1 100644
--- a/modules/protocol/hybrid.cpp
+++ b/modules/protocol/hybrid.cpp
@@ -625,13 +625,6 @@ public:
 		message_certfp(this)
 	{
 		this->AddModes();
-
-
-		if (Me->GetSID() == Me->GetName())
-			Me->SetSID(Servers::TS6_SID_Retrieve());
-
-		for (botinfo_map::iterator it = BotListByNick->begin(), it_end = BotListByNick->end(); it != it_end; ++it)
-			it->second->GenerateUID();
 	}
 
 	void OnUserNickChange(User *u, const Anope::string &) anope_override
diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp
index 2e880b631..a28b3c511 100644
--- a/modules/protocol/inspircd12.cpp
+++ b/modules/protocol/inspircd12.cpp
@@ -1323,15 +1323,7 @@ class ProtoInspIRCd : public Module
 		message_idle(this), message_metadata(this), message_mode(this), message_nick(this), message_opertype(this), message_rsquit(this),
 		message_setident(this), message_server(this), message_time(this), message_uid(this), message_encap(this)
 	{
-
-
 		Servers::Capab.insert("NOQUIT");
-
-		if (Me->GetSID() == Me->GetName())
-			Me->SetSID(Servers::TS6_SID_Retrieve());
-
-		for (botinfo_map::iterator it = BotListByNick->begin(), it_end = BotListByNick->end(); it != it_end; ++it)
-			it->second->GenerateUID();
 	}
 
 	void OnReload(Configuration::Conf *conf) anope_override
diff --git a/modules/pseudoclients/botserv.cpp b/modules/pseudoclients/botserv.cpp
index e8452de13..dac89a2f7 100644
--- a/modules/pseudoclients/botserv.cpp
+++ b/modules/pseudoclients/botserv.cpp
@@ -49,7 +49,7 @@ class BotServCore : public Module
 
 	void OnBotAssign(User *sender, ChannelInfo *ci, BotInfo *bi) anope_override
 	{
-		if (Me->IsSynced() && ci->c && ci->c->users.size() >= Config->GetModule(this)->Get<unsigned>("minusers"))
+		if (ci->c && ci->c->users.size() >= Config->GetModule(this)->Get<unsigned>("minusers"))
 		{
 			ChannelStatus status(Config->GetModule(this)->Get<const Anope::string>("botmodes"));
 			bi->Join(ci->c, &status);
diff --git a/modules/pseudoclients/global.cpp b/modules/pseudoclients/global.cpp
index 1500ebb17..9a886c64c 100644
--- a/modules/pseudoclients/global.cpp
+++ b/modules/pseudoclients/global.cpp
@@ -79,7 +79,7 @@ class GlobalCore : public Module, public GlobalService
 	void OnNewServer(Server *s) anope_override
 	{
 		const Anope::string &gl = Config->GetModule(this)->Get<const Anope::string>("globaloncycleup");
-		if (!gl.empty() && !Me->IsSynced())
+		if (!gl.empty() && Me && !Me->IsSynced())
 			s->Notice(Global, gl);
 	}