Don't send an override notice if no modes were actually applied, thanks Ankit.

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / nickcollide.cpp

diff --git a/src/modules/m_spanningtree/nickcollide.cpp b/src/modules/m_spanningtree/nickcollide.cpp
index 9ef5b48f4620c4bc800b4f8c6d4e76319cbebc57..6df07b9cd1b2efc847cad6e970b3439209f1ab76 100644 (file)
--- a/src/modules/m_spanningtree/nickcollide.cpp
+++ b/src/modules/m_spanningtree/nickcollide.cpp
@@ -35,24 +35,24 @@ int TreeSocket::DoCollision(User *u, time_t remotets, const std::string &remotei
         * These days, we have UID. And, so what we do is, force nick change client(s)
         * involved according to timestamp rules.
         *
-        * RULES:        
-        *  user@ip equal:       
-        *   Force nick change on OLDER timestamped client       
-        *  user@ip differ:      
-        *   Force nick change on NEWER timestamped client       
-        *  TS EQUAL:    
-        *   FNC both.   
-        *       
-        * This stops abusive use of collisions, simplifies problems with loops, and so on.      
+        * RULES:
+        *  user@ip equal:
+        *   Force nick change on OLDER timestamped client
+        *  user@ip differ:
+        *   Force nick change on NEWER timestamped client
+        *  TS EQUAL:
+        *   FNC both.
+        *
+        * This stops abusive use of collisions, simplifies problems with loops, and so on.
         *   -- w00t
         */
        bool bChangeLocal = true;
        bool bChangeRemote = true;
 
-       /* for brevity, don't use the User */
-       time_t localts = u->age;
-       const std::string localident = u->ident;
-       const std::string localip = u->GetIPString();
+       /* for brevity, don't use the User - use defines to avoid any copy */
+       #define localts u->age
+       #define localident u->ident
+       #define localip u->GetIPString()
 
        /* mmk. let's do this again. */
        if (remotets == localts)
@@ -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)