X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_noctcp.cpp;h=e9733cf543699ef4730fde4d663f32ad6851a408;hb=565544fac966b14e046bb3042ab485f79bcf7c9e;hp=9dd9bf852d25e1dd3da1e4ed88079ad2f1aba315;hpb=81027f3a0888ac4c8e3fb6ea90081492defce946;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index 9dd9bf852..e9733cf54 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -22,21 +22,15 @@
 #include "inspircd.h"
 #include "modules/exemption.h"
 
-class NoCTCP : public SimpleChannelModeHandler
-{
- public:
-	NoCTCP(Module* Creator) : SimpleChannelModeHandler(Creator, "noctcp", 'C') { }
-};
-
 class ModuleNoCTCP : public Module
 {
 	CheckExemption::EventProvider exemptionprov;
-	NoCTCP nc;
+	SimpleChannelModeHandler nc;
 
  public:
 	ModuleNoCTCP()
 		: exemptionprov(this)
-		, nc(this)
+		, nc(this, "noctcp", 'C')
 	{
 	}
 
@@ -50,11 +44,10 @@ class ModuleNoCTCP : public Module
 		if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
 		{
 			Channel* c = (Channel*)dest;
-			if ((text.empty()) || (text[0] != '\001') || (!strncmp(text.c_str(),"\1ACTION ",8)))
+			if ((text.empty()) || (text[0] != '\001') || (!strncmp(text.c_str(),"\1ACTION ", 8)) || (text == "\1ACTION\1") || (text == "\1ACTION"))
 				return MOD_RES_PASSTHRU;
 
-			ModResult res;
-			FIRST_MOD_RESULT_CUSTOM(exemptionprov, CheckExemption::EventListener, OnCheckExemption, res, (user, c, "noctcp"));
+			ModResult res = CheckExemption::Call(exemptionprov, user, c, "noctcp");
 			if (res == MOD_RES_ALLOW)
 				return MOD_RES_PASSTHRU;