From b868bb52c55fc902e0acab3c4a43576826817e85 Mon Sep 17 00:00:00 2001
From: danieldg
Date: Sat, 24 Oct 2009 03:29:58 +0000
Subject: Get rid of ModePair

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11963 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/modules/m_servprotect.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/modules/m_servprotect.cpp')

diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp
index 7fd867e9b..dcb0cd7d5 100644
--- a/src/modules/m_servprotect.cpp
+++ b/src/modules/m_servprotect.cpp
@@ -79,11 +79,12 @@ class ModuleServProtectMode : public Module
 			User *u = ServerInstance->FindNick(param);
 			if (u)
 			{
+				Membership* memb = chan->GetUser(u);
 				/* The target user has +k set on themselves, and you are trying to remove a privilege mode the user has set on themselves.
 				 * This includes any prefix permission mode, even those registered in other modules, e.g. +qaohv. Using ::ModeString()
 				 * here means that the number of modes is restricted to only modes the user has, limiting it to as short a loop as possible.
 				 */
-				if (u->IsModeSet('k') && ServerInstance->Modes->ModeString(u, chan, false).find(mode) != std::string::npos)
+				if (u->IsModeSet('k') && memb && memb->modes.find(mode) != std::string::npos)
 				{
 					/* BZZZT, Denied! */
 					user->WriteNumeric(482, "%s %s :You are not permitted to remove privileges from %s services", user->nick.c_str(), chan->name.c_str(), ServerInstance->Config->Network.c_str());
-- 
cgit v1.3.1-10-gc9f91