1 files changed, 21 insertions, 34 deletions

diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp
index 25937cd6e..d061a5eab 100644
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -64,28 +64,28 @@ class ModuleOperPrefixMode;
 class HideOperWatcher : public ModeWatcher
 {
 	ModuleOperPrefixMode* parentmod;
+
  public:
-	HideOperWatcher(ModuleOperPrefixMode* parent) : ModeWatcher((Module*) parent, 'H', MODETYPE_USER), parentmod(parent) {}
-	void AfterMode(User* source, User* dest, Channel* channel, const std::string &parameter, bool adding, ModeType type);
+	HideOperWatcher(ModuleOperPrefixMode* parent);
+	void AfterMode(User* source, User* dest, Channel* channel, const std::string &parameter, bool adding);
 };
 
 class ModuleOperPrefixMode : public Module
 {
- private:
 	OperPrefixMode opm;
-	bool mw_added;
 	HideOperWatcher hideoperwatcher;
+
  public:
 	ModuleOperPrefixMode()
-		: opm(this), mw_added(false), hideoperwatcher(this)
+		: opm(this), hideoperwatcher(this)
 	{
 	}
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
 		ServerInstance->Modules->AddService(opm);
 
-		Implementation eventlist[] = { I_OnUserPreJoin, I_OnPostOper, I_OnLoadModule, I_OnUnloadModule };
+		Implementation eventlist[] = { I_OnUserPreJoin, I_OnPostOper };
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 
 		/* To give clients a chance to learn about the new prefix we don't give +y to opers
@@ -93,19 +93,12 @@ class ModuleOperPrefixMode : public Module
 		 * they need to rejoin them in order to get the oper prefix.
 		 */
 
-		if (ServerInstance->Modules->Find("m_hideoper.so"))
-			mw_added = ServerInstance->Modes->AddModeWatcher(&hideoperwatcher);
+		ServerInstance->Modes->AddModeWatcher(&hideoperwatcher);
 	}
 
-	ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string& privs, const std::string& keygiven)
+	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
 	{
-		/* The user may have the +H umode on himself, but +H does not necessarily correspond
-		 * to the +H of m_hideoper.
-		 * However we only add the modewatcher when m_hideoper is loaded, so these
-		 * conditions (mw_added and the user being +H) together mean the user is a hidden oper.
-		 */
-
-		if (IS_OPER(user) && (!mw_added || !user->IsModeSet('H')))
+		if ((user->IsOper()) && (user->IsModeSet('H')))
 			privs.push_back('y');
 		return MOD_RES_PASSTHRU;
 	}
@@ -123,31 +116,19 @@ class ModuleOperPrefixMode : public Module
 		}
 	}
 
-	void OnPostOper(User* user, const std::string& opername, const std::string& opertype)
+	void OnPostOper(User* user, const std::string& opername, const std::string& opertype) CXX11_OVERRIDE
 	{
-		if (IS_LOCAL(user) && (!mw_added || !user->IsModeSet('H')))
+		if (IS_LOCAL(user) && (!user->IsModeSet('H')))
 			SetOperPrefix(user, true);
 	}
 
-	void OnLoadModule(Module* mod)
-	{
-		if ((!mw_added) && (mod->ModuleSourceFile == "m_hideoper.so"))
-			mw_added = ServerInstance->Modes->AddModeWatcher(&hideoperwatcher);
-	}
-
-	void OnUnloadModule(Module* mod)
-	{
-		if ((mw_added) && (mod->ModuleSourceFile == "m_hideoper.so") && (ServerInstance->Modes->DelModeWatcher(&hideoperwatcher)))
-			mw_added = false;
-	}
 
 	~ModuleOperPrefixMode()
 	{
-		if (mw_added)
-			ServerInstance->Modes->DelModeWatcher(&hideoperwatcher);
+		ServerInstance->Modes->DelModeWatcher(&hideoperwatcher);
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Gives opers cmode +y which provides a staff prefix.", VF_VENDOR);
 	}
@@ -160,7 +141,13 @@ class ModuleOperPrefixMode : public Module
 	}
 };
 
-void HideOperWatcher::AfterMode(User* source, User* dest, Channel* channel, const std::string& parameter, bool adding, ModeType type)
+HideOperWatcher::HideOperWatcher(ModuleOperPrefixMode* parent)
+	: ModeWatcher(parent, "hideoper", MODETYPE_USER)
+	, parentmod(parent)
+{
+}
+
+void HideOperWatcher::AfterMode(User* source, User* dest, Channel* channel, const std::string& parameter, bool adding)
 {
 	if (IS_LOCAL(dest))
 		parentmod->SetOperPrefix(dest, !adding);