m_spanningtree Only unserialize() METADATA if the object type matches ExtensionItem...

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

diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp
index 3f05dd086fe4a16f9d8beec6f5d27b5aa5c8eac8..4c63e53d1b109153d45560eacd2924c76a0c508b 100644 (file)
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -29,12 +29,12 @@
 class OperPrefixMode : public PrefixMode
 {
        public:
-               OperPrefixMode(Module* Creator) : PrefixMode(Creator, "operprefix", 'y')
+               OperPrefixMode(Module* Creator)
+                       : PrefixMode(Creator, "operprefix", 'y', OPERPREFIX_VALUE)
                {
                        std::string pfx = ServerInstance->Config->ConfValue("operprefix")->getString("prefix", "!");
                        prefix = pfx.empty() ? '!' : pfx[0];
                        levelrequired = INT_MAX;
-                       prefixrank = OPERPREFIX_VALUE;
                }
 };
 
@@ -74,16 +74,10 @@ class ModuleOperPrefixMode : public Module
 
        void SetOperPrefix(User* user, bool add)
        {
-               std::vector<std::string> modechange;
-               modechange.push_back("");
-               modechange.push_back(add ? "+" : "-");
-               modechange[1].push_back(opm.GetModeChar());
-               modechange.push_back(user->nick);
+               Modes::ChangeList changelist;
+               changelist.push(&opm, add, user->nick);
                for (User::ChanList::iterator v = user->chans.begin(); v != user->chans.end(); v++)
-               {
-                       modechange[0] = (*v)->chan->name;
-                       ServerInstance->Modes->Process(modechange, ServerInstance->FakeClient);
-               }
+                       ServerInstance->Modes->Process(ServerInstance->FakeClient, (*v)->chan, NULL, changelist);
        }
 
        void OnPostOper(User* user, const std::string& opername, const std::string& opertype) CXX11_OVERRIDE