Replace hardcoded mode letters passed to IsModeSet() and GetModeParameter() with...

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

diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp
index e7533fc07f29f3de2df873ee695e865d32c162c0..6de6b235cf1bbf6076c0b4dd39468bf94ffc8cc1 100644 (file)
--- a/src/modules/m_nickflood.cpp
+++ b/src/modules/m_nickflood.cpp
@@ -115,16 +115,14 @@ class NickFlood : public ModeHandler
 
                        ext.set(channel, new nickfloodsettings(nsecs, nnicks));
                        parameter = ConvToStr(nnicks) + ":" + ConvToStr(nsecs);
-                       channel->SetModeParam('F', parameter);
                        return MODEACTION_ALLOW;
                }
                else
                {
-                       if (!channel->IsModeSet('F'))
+                       if (!channel->IsModeSet(this))
                                return MODEACTION_DENY;
 
                        ext.unset(channel);
-                       channel->SetModeParam('F', "");
                        return MODEACTION_ALLOW;
                }
        }
@@ -150,9 +148,6 @@ class ModuleNickFlood : public Module
 
        ModResult OnUserPreNick(User* user, const std::string &newnick) CXX11_OVERRIDE
        {
-               if (ServerInstance->NICKForced.get(user)) /* Allow forced nick changes */
-                       return MOD_RES_PASSTHRU;
-
                for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
                {
                        Channel *channel = *i;