From ad3524174350633c25dc8a4e5ffbb7066c4b8cba Mon Sep 17 00:00:00 2001
From: w00t
Date: Sun, 21 Sep 2008 12:56:03 +0000
Subject: Be consistent. Use ServerInstance in all places instead of 'Instance'
 in half. This has bugged me forever :p. I think I got all of extra/ too..

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10579 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/modules/m_spanningtree/nickcollide.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/modules/m_spanningtree/nickcollide.cpp')

diff --git a/src/modules/m_spanningtree/nickcollide.cpp b/src/modules/m_spanningtree/nickcollide.cpp
index 5531f9c0e..6df07b9cd 100644
--- a/src/modules/m_spanningtree/nickcollide.cpp
+++ b/src/modules/m_spanningtree/nickcollide.cpp
@@ -105,7 +105,7 @@ int TreeSocket::DoCollision(User *u, time_t remotets, const std::string &remotei
 		 * have 928AAAB's nick set to that.
 		 *   -- w00t
 		 */
-		User *remote = this->Instance->FindUUID(remoteuid);
+		User *remote = this->ServerInstance->FindUUID(remoteuid);
 
 		if (remote)
 		{
@@ -115,7 +115,7 @@ int TreeSocket::DoCollision(User *u, time_t remotets, const std::string &remotei
 		else
 		{
 			/* user has not been introduced yet, just inform their server */
-			this->WriteLine(std::string(":")+this->Instance->Config->GetSID()+" SVSNICK "+remoteuid+" " + remoteuid + " " + ConvToStr(remotets));
+			this->WriteLine(std::string(":")+this->ServerInstance->Config->GetSID()+" SVSNICK "+remoteuid+" " + remoteuid + " " + ConvToStr(remotets));
 		}
 
 		if (!bChangeLocal)
-- 
cgit v1.3.1-10-gc9f91