Use loopCall to protect OnUserKick rather than the triggerevents hack

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

diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp
index 10ae40cb752c69859246f3e5d5aa6a69d939733a..0a8e9a31d2ecd9cb21640f5e7cc263422e77db61 100644 (file)
--- a/src/modules/m_nickflood.cpp
+++ b/src/modules/m_nickflood.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -144,8 +144,7 @@ class NickFlood : public ModeHandler
                                                parameter = ConvToStr(nnicks) + ":" +ConvToStr(nsecs);
                                                nickfloodsettings *f = new nickfloodsettings(ServerInstance, nsecs, nnicks);
                                                channel->Extend("nickflood", f);
-                                               channel->SetMode('F', true);
-                                               channel->SetModeParam('F', parameter.c_str(), true);
+                                               channel->SetMode('F', parameter);
                                                return MODEACTION_ALLOW;
                                        }
                                        else
@@ -168,8 +167,7 @@ class NickFlood : public ModeHandler
                                                                f = new nickfloodsettings(ServerInstance, nsecs, nnicks);
                                                                channel->Shrink("nickflood");
                                                                channel->Extend("nickflood", f);
-                                                               channel->SetModeParam('F', cur_param.c_str(), false);
-                                                               channel->SetModeParam('F', parameter.c_str(), true);
+                                                               channel->SetMode('F', parameter);
                                                                return MODEACTION_ALLOW;
                                                        }
                                                        else
@@ -194,7 +192,7 @@ class NickFlood : public ModeHandler
                                channel->GetExt("nickflood", f);
                                delete f;
                                channel->Shrink("nickflood");
-                               channel->SetMode('F', false);
+                               channel->SetMode('F', "");
                                return MODEACTION_ALLOW;
                        }
                }