Add Module::init() for correct exception handling during hook registration

[user/henk/code/inspircd.git] / src / userprocess.cpp

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index d4de2907596221296d04cb9285172ebe568595aa..75cd8634a5935e9b4660f96cafba4cbe889ab1f0 100644 (file)
--- a/src/userprocess.cpp
+++ b/src/userprocess.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
@@ -46,19 +46,23 @@ void InspIRCd::DoBackgroundUserStuff()
        /*
         * loop over all local users..
         */
-       std::vector<User*>::reverse_iterator count2 = this->Users->local_users.rbegin();
+       std::vector<LocalUser*>::reverse_iterator count2 = this->Users->local_users.rbegin();
        while (count2 != this->Users->local_users.rend())
        {
-               User *curr = *count2;
+               LocalUser *curr = *count2;
                count2++;
 
                if (curr->quitting)
                        continue;
 
-               if (curr->Penalty)
+               if (curr->CommandFloodPenalty)
                {
-                       curr->Penalty--;
-                       curr->OnDataReady();
+                       unsigned int rate = curr->MyClass->GetCommandRate();
+                       if (curr->CommandFloodPenalty > rate)
+                               curr->CommandFloodPenalty -= rate;
+                       else
+                               curr->CommandFloodPenalty = 0;
+                       curr->eh.OnDataReady();
                }
 
                switch (curr->registered)