From 98a92e20f1fa4a9c7e5749e063414483d4615c2e Mon Sep 17 00:00:00 2001
From: brain
Date: Thu, 27 Jul 2006 17:59:20 +0000
Subject: Mode merging during FJOIN with ourts==theirts. Only +k and +l have
 CheckTimestamp methods atm, needs to be finished by me and TIDIED.

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

(limited to 'src/mode.cpp')

diff --git a/src/mode.cpp b/src/mode.cpp
index d5ee5acdd..5b32c707a 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -292,13 +292,13 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
 			 * (e.g. are they a (half)op?
 			 */
 
-			if (cstatus(user, targetchannel) < STATUS_HOP)
+			if ((IS_LOCAL(user)) && (cstatus(user, targetchannel) < STATUS_HOP))
 			{
 				/* We don't have halfop */
 				log(DEBUG,"The user is not a halfop or above, checking other reasons for being able to set the modes");
 
 				/* Are we a uline or is it a servermode? */
-				if ((!is_uline(user->server)) && (!servermode) && (IS_LOCAL(user)))
+				if ((!is_uline(user->server)) && (!servermode))
 				{
 					/* Not enough permission:
 					 * NOT a uline and NOT a servermode,
-- 
cgit v1.3.1-10-gc9f91