summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2004-04-10 21:13:01 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2004-04-10 21:13:01 +0000
commitfc386fd1885226f57eb9220fabd1e7563e6baf51 (patch)
treef4c9c733afe3091143586d19058a6cab0a9e34ed
parent88b5914b7aa9e1745e9018941d464042dee3bdd1 (diff)
'm' token override fixes
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@515 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--src/inspircd.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 11a91ca48..13f8c7d72 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -3526,6 +3526,11 @@ void merge_mode2(char **parameters, int pcnt, userrec* user)
Ptr = FindChan(parameters[0]);
if (Ptr)
{
+ if ((cstatus(user,Ptr) < STATUS_HOP) && (Ptr))
+ {
+ return;
+ }
+
process_modes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,true);
}
}