Run DelMode and DelModeWatcher in RemoveModule

[user/henk/code/inspircd.git] / src / modules / m_blockcolor.cpp

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 1aa2a1bd9a4e3927f0235cff60bed671ed4b1b08..ce8325e454702f53bad4e241dd1009e69ffddc88 100644 (file)
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -20,7 +20,7 @@
 class BlockColor : public SimpleChannelModeHandler
 {
  public:
-       BlockColor(InspIRCd* Instance, Module* Creator) : SimpleChannelModeHandler(Instance, Creator, 'c') { }
+       BlockColor(Module* Creator) : SimpleChannelModeHandler(Creator, 'c') { }
 };
 
 class ModuleBlockColour : public Module
@@ -29,7 +29,7 @@ class ModuleBlockColour : public Module
        BlockColor bc;
  public:
 
-       ModuleBlockColour(InspIRCd* Me) : Module(Me), bc(Me, this)
+       ModuleBlockColour() : bc(this)
        {
                if (!ServerInstance->Modes->AddMode(&bc))
                        throw ModuleException("Could not add new modes!");
@@ -48,7 +48,7 @@ class ModuleBlockColour : public Module
                {
                        Channel* c = (Channel*)dest;
 
-                       if (CHANOPS_EXEMPT(ServerInstance, 'c') && c->GetPrefixValue(user) == OP_VALUE)
+                       if (CHANOPS_EXEMPT('c') && c->GetPrefixValue(user) == OP_VALUE)
                        {
                                return MOD_RES_PASSTHRU;
                        }
@@ -82,12 +82,11 @@ class ModuleBlockColour : public Module
 
        virtual ~ModuleBlockColour()
        {
-               ServerInstance->Modes->DelMode(&bc);
        }
 
        virtual Version GetVersion()
        {
-               return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("Provides support for unreal-style channel mode +c",VF_COMMON|VF_VENDOR,API_VERSION);
        }
 };