summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-04-08 10:29:45 +0000
committerw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-04-08 10:29:45 +0000
commit2a14a087c4d778562120b54d62f893faaf964313 (patch)
tree6a93942e794733a107f7a6027ce49a37c9ab544e /src
parent1ff54f0c4d4a53003319e72e3c7cbcf4c6c025e3 (diff)
REG_ALL check is not required, since OnUserConnect is triggered after NICK/USER recieved, but we don't want to bother trying to SHUN remote users too, so check IS_LOCAL in the connection event
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9419 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src')
-rw-r--r--src/modules/m_shun.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index a5c98dbbf..07ad36ddb 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -182,6 +182,9 @@ class ModuleShun : public Module
virtual void OnUserConnect(User* user)
{
+ if (!IS_LOCAL(user))
+ return 0;
+
// Apply lines on user connect
XLine *rl = ServerInstance->XLines->MatchesLine("SHUN", user);
@@ -194,9 +197,6 @@ class ModuleShun : public Module
virtual int OnPreCommand(const std::string &command, const char* const*parameters, int pcnt, User* user, bool validated, const std::string &original_line)
{
- if (user->registered != REG_ALL)
- return 0;
-
if((command != "PONG") && (command != "PING"))
{
if (user->GetExt("shunned"))