Wahhhhhhhhhhhh bwahahaha. Mass commit to tidy up tons of messy include lists

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

diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index ae168730aa9d2531df6dad47f0ee9a234106b9aa..dbf6f1127e88ee6588b6834f749f1fa7108dc949 100644 (file)
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -16,17 +16,13 @@
 
 using namespace std;
 
-#include <stdio.h>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +L (limit redirection) */
 
-extern InspIRCd* ServerInstance;
-
 class Redirect : public ModeHandler
 {
  public:
@@ -120,19 +116,14 @@ class ModuleRedirect : public Module
        
        void Implements(char* List)
        {
-               List[I_On005Numeric] = List[I_OnUserPreJoin] = 1;
+               List[I_OnUserPreJoin] = 1;
        }
 
-       virtual void On005Numeric(std::string &output)
-       {
-               ServerInstance->ModeGrok->InsertMode(output, "L", 3);
-       }
-       
        virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
        {
                if (chan)
                {
-                       if (chan->IsModeSet('L'))
+                       if (chan->IsModeSet('L') && chan->limit)
                        {
                                if (chan->GetUserCounter() >= chan->limit)
                                {