From fc386fd1885226f57eb9220fabd1e7563e6baf51 Mon Sep 17 00:00:00 2001
From: brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Sat, 10 Apr 2004 21:13:01 +0000
Subject: 'm' token override fixes

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@515 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/inspircd.cpp | 5 +++++
 1 file changed, 5 insertions(+)

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);
 	}
 }
-- 
cgit v1.2.3