summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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);
}
}