Collision tweaks

[user/henk/code/inspircd.git] / src / modes / umode_n.cpp

diff --git a/src/modes/umode_n.cpp b/src/modes/umode_n.cpp
index db386a32b06f24f6f3f25fa08f81e7ec725eb8e2..ed08b60f4e80f73d6ec63ab6ba092c3d78afb889 100644 (file)
--- a/src/modes/umode_n.cpp
+++ b/src/modes/umode_n.cpp
@@ -24,7 +24,7 @@ ModeUserServerNoticeMask::ModeUserServerNoticeMask(InspIRCd* Instance) : ModeHan
 ModeAction ModeUserServerNoticeMask::OnModeChange(User* source, User* dest, Channel*, std::string &parameter, bool adding, bool servermode)
 {
        /* Only opers can change other users modes */
-       if ((source != dest) && (!*source->oper))
+       if ((source != dest) && (!IS_OPER(source)))
                return MODEACTION_DENY;
 
        /* Set the array fields */
@@ -38,8 +38,10 @@ ModeAction ModeUserServerNoticeMask::OnModeChange(User* source, User* dest, Chan
                dest->modes[UM_SNOMASK] = true;
                if (!dest->modes[UM_SERVERNOTICE])
                {
-                       const char* newmodes[] = { dest->nick, "+s" };
-                       ServerInstance->Modes->Process(newmodes, 2, source, true);
+                       std::vector<std::string> newmodes;
+                       newmodes.push_back(dest->nick);
+                       newmodes.push_back("+s");
+                       ServerInstance->Modes->Process(newmodes, source, true);
                }
                return MODEACTION_ALLOW;
        }