Added a plexus3 protocol module

2 files changed, 7 insertions, 9 deletions

diff --git a/src/protocol.cpp b/src/protocol.cpp
index 0e4449d21..545824681 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -173,9 +173,9 @@ void IRCDProto::SendQuit(const User *u, const char *fmt, ...)
 void IRCDProto::SendPing(const Anope::string &servname, const Anope::string &who)
 {
 	if (servname.empty())
-		send_cmd(ircd->ts6 ? TS6SID : Config->ServerName, "PING %s", who.c_str());
+		send_cmd(ircd->ts6 ? Config->Numeric : Config->ServerName, "PING %s", who.c_str());
 	else
-		send_cmd(ircd->ts6 ? TS6SID : Config->ServerName, "PING %s %s", servname.c_str(), who.c_str());
+		send_cmd(ircd->ts6 ? Config->Numeric : Config->ServerName, "PING %s %s", servname.c_str(), who.c_str());
 }
 
 /**
@@ -187,9 +187,9 @@ void IRCDProto::SendPing(const Anope::string &servname, const Anope::string &who
 void IRCDProto::SendPong(const Anope::string &servname, const Anope::string &who)
 {
 	if (servname.empty())
-		send_cmd(ircd->ts6 ? TS6SID : Config->ServerName, "PONG %s", who.c_str());
+		send_cmd(ircd->ts6 ? Config->Numeric : Config->ServerName, "PONG %s", who.c_str());
 	else
-		send_cmd(ircd->ts6 ? TS6SID : Config->ServerName, "PONG %s %s", servname.c_str(), who.c_str());
+		send_cmd(ircd->ts6 ? Config->Numeric : Config->ServerName, "PONG %s %s", servname.c_str(), who.c_str());
 }
 
 void IRCDProto::SendJoin(BotInfo *bi, const ChannelContainer *cc)
diff --git a/src/servers.cpp b/src/servers.cpp
index acd26b4d3..f7bef6ec7 100644
--- a/src/servers.cpp
+++ b/src/servers.cpp
@@ -12,8 +12,6 @@
 #include "services.h"
 #include "modules.h"
 
-Anope::string TS6SID;
-
 /* Anope */
 Server *Me = NULL;
 
@@ -422,7 +420,7 @@ static char ts6_new_uid[10];
 
 static void ts6_uid_increment(unsigned slot)
 {
-	if (slot != TS6SID.length())
+	if (slot != Config->Numeric.length())
 	{
 		if (ts6_new_uid[slot] == 'Z')
 			ts6_new_uid[slot] = '0';
@@ -456,7 +454,7 @@ const char *ts6_uid_retrieve()
 
 	if (!ts6_uid_initted)
 	{
-		snprintf(ts6_new_uid, 10, "%sAAAAAA", TS6SID.c_str());
+		snprintf(ts6_new_uid, 10, "%sAAAAAA", Config->Numeric.c_str());
 		ts6_uid_initted = true;
 	}
 
@@ -522,7 +520,7 @@ const char *ts6_sid_retrieve()
 	if (!ts6_sid_initted)
 	{
 		// Initialize ts6_new_sid with the services server SID
-		snprintf(ts6_new_sid, 4, "%s", TS6SID.c_str());
+		snprintf(ts6_new_sid, 4, "%s", Config->Numeric.c_str());
 		ts6_sid_initted = true;
 	}