Move all local-only fields to LocalUser

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

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index fe0aab3b98247d45a96333a7c1688b981087303f..9fc8f85bb449999643d1d90b1f7d5e6cbbad44c4 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -249,11 +249,10 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
 
        /* Modify the user's penalty regardless of whether or not the command exists */
        bool do_more = true;
-       if (!user->HasPrivPermission("users/flood/no-throttle"))
+       if (IS_LOCAL(user) && !user->HasPrivPermission("users/flood/no-throttle"))
        {
                // If it *doesn't* exist, give it a slightly heftier penalty than normal to deter flooding us crap
-               user->IncreasePenalty(cm != cmdlist.end() ? cm->second->Penalty : 2);
-               do_more = (user->Penalty < 10);
+               IS_LOCAL(user)->Penalty += cm != cmdlist.end() ? cm->second->Penalty : 2;
        }
 
 
@@ -328,8 +327,9 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
                return true;
 
        /* activity resets the ping pending timer */
-       if (user->MyClass)
-               user->nping = ServerInstance->Time() + user->MyClass->GetPingTime();
+       LocalUser* luser = IS_LOCAL(user);
+       if (luser)
+               luser->nping = ServerInstance->Time() + luser->MyClass->GetPingTime();
 
        if (cm->second->flags_needed)
        {