Dynamically determine the size of the eventlist[] passed to Attach()

[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 7c8452a6cb514874792e6f5d69a66876b4c2251c..349bf1a5d1f38e07f6a2ee2577a7301502e1d26d 100644 (file)
--- a/src/modules/m_nickflood.cpp
+++ b/src/modules/m_nickflood.cpp
@@ -56,7 +56,7 @@ class nickfloodsettings
                 * on successful nick changes; this will be checked before the counter is
                 * incremented.
                 */
-               return (counter + 1 >= this->nicks);
+               return ((ServerInstance->Time() <= reset) && (counter == this->nicks));
        }
 
        void clear()
@@ -138,12 +138,16 @@ class ModuleNickFlood : public Module
 
        ModuleNickFlood()
                : nf(this)
+       {
+       }
+
+       void init()
        {
                if (!ServerInstance->Modes->AddMode(&nf))
                        throw ModuleException("Could not add new modes!");
                ServerInstance->Extensions.Register(&nf.ext);
                Implementation eventlist[] = { I_OnUserPreNick, I_OnUserPostNick };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        ModResult OnUserPreNick(User* user, const std::string &newnick)