diff options
| author |  w00t | 2008-09-21 12:56:03 +0000 |
|---|---|---|
| committer | w00t | 2008-09-21 12:56:03 +0000 |
| commit | ad3524174350633c25dc8a4e5ffbb7066c4b8cba (patch) | |
| tree | 32b54faeca449b75ae9bc9f839c36ef448c9dd57 /src/modules/m_spanningtree/nickcollide.cpp | |
| parent | Fixes. Dont try and catch exceptions within the RLine ctor, we dont always wa... (diff) | |
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
Diffstat (limited to 'src/modules/m_spanningtree/nickcollide.cpp')
| -rw-r--r-- | src/modules/m_spanningtree/nickcollide.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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) |