Made SANICK not collide the user (theres no need to in the new 1.1 now we have return...

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

diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index 35aecc894eaf5e4c703ecf948963ee2197bbacf6..fddcae288657d3aebb2abe7dcf5b5ef468b1331f 100644 (file)
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -5,7 +5,6 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-
 #include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +J (delay rejoin after kick) */
@@ -120,8 +119,8 @@ public:
                                if (!dl->size())
                                {
                                        // Now it's empty..
-                                               DELETE(dl);
-                                               chan->Shrink("norejoinusers");
+                                       DELETE(dl);
+                                       chan->Shrink("norejoinusers");
                                }
                        }
                }
@@ -163,22 +162,18 @@ public:
 
        virtual void Implements(char* List)
        {
-               List[I_OnCleanup] = List[I_On005Numeric] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserKick] = 1;
-       }
-
-       virtual void On005Numeric(std::string &output)
-       {
-               ServerInstance->Modes->InsertMode(output, "J", 3);
+               List[I_OnCleanup] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserKick] = 1;
        }
 
        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);
        }
 };