summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-09-25 17:46:13 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-09-25 17:46:13 +0000
commitbf7e379e398f94f497a70a7624b75c4f22b9e2fb (patch)
treefd9e372ee0d1be15f24fa4be1c493b8449715924 /src
parent990c308a959a376335e91014bcaeb0081693947b (diff)
More patch
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5325 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src')
-rw-r--r--src/channels.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/channels.cpp b/src/channels.cpp
index ad8dfbbd4..98c64ae6f 100644
--- 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))