Merge pull request #1300 from SaberUK/master+genssl

[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 c5c872169ea1a2b360ff24d60a240e756a790b05..d89de49eb0d0802098e41adfdb840952dcfb2da4 100644 (file)
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -138,8 +138,8 @@ class ModuleMsgFlood : public Module
                                        ServerInstance->Modes->Process(ServerInstance->FakeClient, dest, NULL, changelist);
                                }
 
-                               const std::string kickMessage = "Channel flood triggered (limit is " + ConvToStr(f->lines) +
-                                       " in " + ConvToStr(f->secs) + " secs)";
+                               const std::string kickMessage = "Channel flood triggered (trigger is " + ConvToStr(f->lines) +
+                                       " lines in " + ConvToStr(f->secs) + " secs)";
 
                                dest->KickUser(ServerInstance->FakeClient, user, kickMessage);
 
@@ -150,7 +150,7 @@ class ModuleMsgFlood : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       void Prioritize()
+       void Prioritize() CXX11_OVERRIDE
        {
                // we want to be after all modules that might deny the message (e.g. m_muteban, m_noctcp, m_blockcolor, etc.)
                ServerInstance->Modules->SetPriority(this, I_OnUserPreMessage, PRIORITY_LAST);