Clarify handshake failure messages

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

diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index db77184d64a458a32d2abeeac1d9161c9e0befce..e648d14bed0e774d55e62e51f19cc4678806d0bf 100644 (file)
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -18,7 +18,7 @@
 class NoKicks : public SimpleChannelModeHandler
 {
  public:
-       NoKicks(Module* Creator) : SimpleChannelModeHandler(Creator, 'Q') { }
+       NoKicks(Module* Creator) : SimpleChannelModeHandler(Creator, "nokick", 'Q') { }
 };
 
 class ModuleNoKicks : public Module
@@ -44,7 +44,7 @@ class ModuleNoKicks : public Module
        {
                if (!memb->chan->GetExtBanStatus(source, 'Q').check(!memb->chan->IsModeSet('Q')))
                {
-                       if ((ServerInstance->ULine(source->nick.c_str())) || (ServerInstance->ULine(source->server)) || (!*source->server))
+                       if ((ServerInstance->ULine(source->nick.c_str())) || ServerInstance->ULine(source->server))
                        {
                                // ulines can still kick with +Q in place
                                return MOD_RES_PASSTHRU;
@@ -61,12 +61,11 @@ class ModuleNoKicks : public Module
 
        ~ModuleNoKicks()
        {
-               ServerInstance->Modes->DelMode(&nk);
        }
 
        Version GetVersion()
        {
-               return Version("Provides support for unreal-style channel mode +Q", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides support for unreal-style channel mode +Q", VF_COMMON | VF_VENDOR);
        }
 };