More cleanup of quit servers

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

diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index 3131ab4b225ca63bd381da2dcd960c5b2da79246..c443a88d850674636ddef84f62a7289d023cc2ae 100644 (file)
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -87,14 +87,12 @@ class ModuleOverride : public Module
 
        ModResult OnPreMode(User* source,User* dest,Channel* channel, const std::vector<std::string>& parameters)
        {
-               if (!IS_OPER(source))
-                       return MOD_RES_PASSTHRU;
                if (!source || !channel)
                        return MOD_RES_PASSTHRU;
+               if (!IS_OPER(source) || !IS_LOCAL(source))
+                       return MOD_RES_PASSTHRU;
 
-               unsigned int mode = 0;
-               if (channel->HasUser(source))
-                       mode = channel->GetPrefixValue(source);
+               unsigned int mode = channel->GetPrefixValue(source);
 
                if (mode < HALFOP_VALUE && CanOverride(source, "MODE"))
                {