Improve WriteLine, this should be quite an improvement as it prevents a temporary...

[user/henk/code/inspircd.git] / src / mode.cpp

diff --git a/src/mode.cpp b/src/mode.cpp
index b2cdd9afe3eec5946c925e46b839bb82bdce2422..90489ce62be995f69ae9a901e11c71ee14d82327 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -534,7 +534,7 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
                                else
                                {
                                        user->WriteTo(targetuser,"MODE %s %s%s",targetuser->nick,output_sequence.c_str(), parameter_list.str().c_str());
-                                       FOREACH_MOD(I_OnMode,OnMode(user, targetuser, TYPE_USER, output_sequence));
+                                       FOREACH_MOD(I_OnMode,OnMode(user, targetuser, TYPE_USER, output_sequence + parameter_list.str()));
                                        this->LastParse = targetuser->nick;
                                }
                        }
@@ -729,6 +729,9 @@ std::string ModeParser::ModeString(userrec* user, chanrec* channel)
        std::string types;
        std::string pars;
 
+       if (!channel || !user)
+               return "";
+
        for (unsigned char mode = 'A'; mode <= 'z'; mode++)
        {
                unsigned char pos = (mode-65) | MASK_CHANNEL;
@@ -859,7 +862,7 @@ bool ModeParser::DelModeWatcher(ModeWatcher* mw)
        if (!mw)
                return false;
 
-       if ((mw->GetModeType() < 'A') || (mw->GetModeType() > 'z'))
+       if ((mw->GetModeChar() < 'A') || (mw->GetModeChar() > 'z'))
                return false;
 
        mw->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
@@ -868,7 +871,10 @@ bool ModeParser::DelModeWatcher(ModeWatcher* mw)
        ModeWatchIter a = find(modewatchers[pos].begin(),modewatchers[pos].end(),mw);
 
        if (a == modewatchers[pos].end())
+       {
+               ServerInstance->Log(DEBUG, "ModeParser::DelModeWatcher: Couldn't find watcher for mode %c in list", mw->GetModeChar());
                return false;
+       }
 
        modewatchers[pos].erase(a);
        ServerInstance->Log(DEBUG,"ModeParser::DelModeWatcher: stopped watching mode %c",mw->GetModeChar());
@@ -953,4 +959,3 @@ ModeParser::ModeParser(InspIRCd* Instance) : ServerInstance(Instance)
        this->AddMode(new ModeUserOperator(Instance), 'o');
        this->AddMode(new ModeUserServerNoticeMask(Instance), 'n');
 }
-