X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nokicks.cpp;h=0d5a012ef214ef6aa888784bb8a0ff2e5f6c59ed;hb=04cfaea87edd1b4b742cb607ea69ece760c460aa;hp=b060d87f83f94538dc58c4607e9260ba8108d83b;hpb=7d93921aabd9c608821baec8a871aff844dfae49;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index b060d87f8..0d5a012ef 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -18,7 +18,7 @@
 class NoKicks : public SimpleChannelModeHandler
 {
  public:
-	NoKicks(InspIRCd* Instance, Module* Creator) : SimpleChannelModeHandler(Instance, Creator, 'Q') { }
+	NoKicks(Module* Creator) : SimpleChannelModeHandler(Creator, "nokick", 'Q') { }
 };
 
 class ModuleNoKicks : public Module
@@ -26,8 +26,8 @@ class ModuleNoKicks : public Module
 	NoKicks nk;
 
  public:
-	ModuleNoKicks(InspIRCd* Me)
-		: Module(Me), nk(Me, this)
+	ModuleNoKicks()
+		: nk(this)
 	{
 		if (!ServerInstance->Modes->AddMode(&nk))
 			throw ModuleException("Could not add new modes!");
@@ -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_VENDOR);
 	}
 };