From 68dc4c18497eaabecfffae93cf82ba8b7d40bfb1 Mon Sep 17 00:00:00 2001
From: Daniel De Graaf
Date: Sat, 7 Aug 2010 12:59:49 -0400
Subject: Allow users to specify opflags in m_autoop

---
 src/modules/m_autoop.cpp | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

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

diff --git a/src/modules/m_autoop.cpp b/src/modules/m_autoop.cpp
index 0442d0420..fb1529e0f 100644
--- a/src/modules/m_autoop.cpp
+++ b/src/modules/m_autoop.cpp
@@ -42,21 +42,12 @@ class AutoOpList : public ListModeBase
 				ServerInstance->Modes->FindMode(mid[0], MODETYPE_CHANNEL) :
 				ServerInstance->Modes->FindMode(mid);
 
-			if (adding && (!mh || !mh->GetPrefixRank()))
+			if (adding && mh && mh->GetLevelRequired() > mylevel)
 			{
-				source->WriteNumeric(415, "%s %s :Cannot find prefix mode '%s' for autoop",
-					source->nick.c_str(), mid.c_str(), mid.c_str());
+				source->WriteNumeric(482, "%s %s :You must be able to set mode '%s' to include it in an autoop",
+					source->nick.c_str(), channel->name.c_str(), mid.c_str());
 				return MOD_RES_DENY;
 			}
-			else if (mh)
-			{
-				if (mh->GetLevelRequired() > mylevel)
-				{
-					source->WriteNumeric(482, "%s %s :You must be able to set mode '%s' to include it in an autoop",
-						source->nick.c_str(), channel->name.c_str(), mid.c_str());
-					return MOD_RES_DENY;
-				}
-			}
 		}
 		return MOD_RES_PASSTHRU;
 	}
-- 
cgit v1.3.1-10-gc9f91