More patch

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5325 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/channels.cpp b/src/channels.cpp
index ad8dfbbd44c762866fe687f3dde48c9a0321c11b..98c64ae6fa5f2d2ff0e8a24bfc18d3a4adf074aa 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -408,10 +408,10 @@ chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr,ucrec *a,userrec* u
                                a->uc_modes = UCMODE_VOICE;
                        break;
                }
-               ModeHandler* mh = ServerInstance->Modes->FindPrefix(status);
+               ModeHandler* mh = Instance->Modes->FindPrefix(status);
                if (mh)
                {
-                       Ptr->SetPrefix(user, status, mh->GetRank(), true);
+                       Ptr->SetPrefix(user, status, mh->GetPrefixRank(), true);
                }
        }
 
@@ -421,9 +421,9 @@ chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr,ucrec *a,userrec* u
        Ptr->WriteChannel(user,"JOIN :%s",Ptr->name);
 
        /* Theyre not the first ones in here, make sure everyone else sees the modes we gave the user */
-       std::string ms = ServerInstance->Modes->ModeString(user, channel);
-       if ((channel->usercount() > 1) && (ms.length()))
-               channel->WriteAllExceptSender(user, true, 0, "MODE %s +%s", channel->name, ms.c_str());
+       std::string ms = Instance->Modes->ModeString(user, Ptr);
+       if ((Ptr->GetUserCounter() > 1) && (ms.length()))
+               Ptr->WriteAllExceptSender(user, true, 0, "MODE %s +%s", Ptr->name, ms.c_str());
 
        /* Major improvement by Brain - we dont need to be calculating all this pointlessly for remote users */
        if (IS_LOCAL(user))