Remove m_halfop from list in compat linking mode

[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 33eefadb2e110a4e55824d7c05664f81842cefda..aee4bf8697951e20e92928368b7761b923b1479f 100644 (file)
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -31,17 +31,9 @@ class KickRejoin : public ModeHandler
 {
  public:
        SimpleExtItem<delaylist> ext;
-       KickRejoin(Module* Creator) : ModeHandler(Creator, 'J', PARAM_SETONLY, MODETYPE_CHANNEL),
+       KickRejoin(Module* Creator) : ModeHandler(Creator, "kicknorejoin", 'J', PARAM_SETONLY, MODETYPE_CHANNEL),
                ext("norejoinusers", Creator) { }
 
-       ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
-       {
-               if (channel->IsModeSet('J'))
-                       return std::make_pair(true, channel->GetModeParameter('J'));
-               else
-                       return std::make_pair(false, parameter);
-       }
-
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                if (!adding)
@@ -109,7 +101,7 @@ public:
        {
                if (!ServerInstance->Modes->AddMode(&kr))
                        throw ModuleException("Could not add new modes!");
-               Extensible::Register(&kr.ext);
+               ServerInstance->Extensions.Register(&kr.ext);
                Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserKick };
                ServerInstance->Modules->Attach(eventlist, this, 2);
        }
@@ -166,7 +158,6 @@ public:
 
        ~ModuleKickNoRejoin()
        {
-               ServerInstance->Modes->DelMode(&kr);
        }
 
        Version GetVersion()