Because these modes take no parameter when being removed, they need no special code...

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5111 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 5b1562e1885fdd8390bb46ad235133bc0ce1f348..c7b5700d235c14e5679ca016f3b5de29e33b7e7f 100644 (file)
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -245,12 +245,13 @@ class ModuleJoinFlood : public Module
 
        virtual ~ModuleJoinFlood()
        {
+               ServerInstance->Modes->DelMode(jf);
                DELETE(jf);
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR);
        }
 };
 

diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index d64c60d5608d182c48a216f8af5d9ff76907880a..fddcae288657d3aebb2abe7dcf5b5ef468b1331f 100644 (file)
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -119,8 +119,8 @@ public:
                                if (!dl->size())
                                {
                                        // Now it's empty..
-                                               DELETE(dl);
-                                               chan->Shrink("norejoinusers");
+                                       DELETE(dl);
+                                       chan->Shrink("norejoinusers");
                                }
                        }
                }
@@ -167,12 +167,13 @@ public:
 
        virtual ~ModuleKickNoRejoin()
        {
+               ServerInstance->Modes->DelMode(kr);
                DELETE(kr);
        }
        
        virtual Version GetVersion()
        {
-               return Version(1, 0, 0, 0, VF_STATIC | VF_VENDOR);
+               return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR);
        }
 };
 

diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 3eccb868d1c10fb66c83babf8714cb3fe138ff9f..7deb77a693827f07dc62fc32d65d0c822d1c6d58 100644 (file)
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -264,12 +264,13 @@ class ModuleMsgFlood : public Module
 
        virtual ~ModuleMsgFlood()
        {
+               ServerInstance->Modes->DelMode(mf);
                DELETE(mf);
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR);
        }
 };
 

diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index dbf6f1127e88ee6588b6834f749f1fa7108dc949..efd9b8b1c5a4497b2155f2ce4164957889bb8365 100644 (file)
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -139,12 +139,13 @@ class ModuleRedirect : public Module
 
        virtual ~ModuleRedirect()
        {
+               ServerInstance->Modes->DelMode(re);
                DELETE(re);
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR);
        }
 };