Fix for bug #513

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

diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index e41107706266d1cce9cfa35b6adf6b50d83dda1a..c2a0b32ec67b61d7cb33c13374409f85db9efe1b 100644 (file)
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -236,27 +236,20 @@ class ModuleMsgFlood : public Module
                                        parameters[0] = dest->name;
                                        parameters[1] = "+b";
                                        parameters[2] = user->MakeWildHost();
-                                       ServerInstance->SendMode(parameters,3,user);
-                                       std::deque<std::string> n;
-                                       /* Propogate the ban to other servers.
-                                        * We dont know what protocol we may be using,
-                                        * so this event is picked up by our protocol
-                                        * module and formed into a ban command that
-                                        * suits the protocol in use.
-                                        */
-                                       n.push_back(dest->name);
-                                       n.push_back("+b");
-                                       n.push_back(user->MakeWildHost());
-                                       Event rmode((char *)&n, NULL, "send_mode");
-                                       rmode.Send(ServerInstance);
+                                       ServerInstance->SendMode(parameters, 3, ServerInstance->FakeClient);
+
+                                       ServerInstance->PI->SendModeStr(dest->name, std::string("+b ") + user->MakeWildHost());
                                }
+
                                char kickmessage[MAXBUF];
                                snprintf(kickmessage, MAXBUF, "Channel flood triggered (limit is %d lines in %d secs)", f->lines, f->secs);
+
                                if (!dest->ServerKickUser(user, kickmessage, true))
                                {
                                        delete dest;
-                                       return 1;
                                }
+
+                               return 1;
                        }
                }