Create the core_xline module

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

diff --git a/src/modules.cpp b/src/modules.cpp
index cbb8661ae8ec2a2dd107441f1699e71a751badd4..3723b09c333ed537fbb8f0504681b912c2a49ba5 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -408,16 +408,23 @@ void ModuleManager::DoSafeUnload(Module* mod)
                mod->OnCleanup(TYPE_USER, user);
                user->doUnhookExtensions(items);
        }
-       for(char m='A'; m <= 'z'; m++)
+
+       const ModeParser::ModeHandlerMap& usermodes = ServerInstance->Modes->GetModes(MODETYPE_USER);
+       for (ModeParser::ModeHandlerMap::const_iterator i = usermodes.begin(); i != usermodes.end(); ++i)
        {
-               ModeHandler* mh;
-               mh = ServerInstance->Modes->FindMode(m, MODETYPE_USER);
-               if (mh && mh->creator == mod)
+               ModeHandler* mh = i->second;
+               if (mh->creator == mod)
                        this->DelService(*mh);
-               mh = ServerInstance->Modes->FindMode(m, MODETYPE_CHANNEL);
-               if (mh && mh->creator == mod)
+       }
+
+       const ModeParser::ModeHandlerMap& chanmodes = ServerInstance->Modes->GetModes(MODETYPE_CHANNEL);
+       for (ModeParser::ModeHandlerMap::const_iterator i = chanmodes.begin(); i != chanmodes.end(); ++i)
+       {
+               ModeHandler* mh = i->second;
+               if (mh->creator == mod)
                        this->DelService(*mh);
        }
+
        for(std::multimap<std::string, ServiceProvider*>::iterator i = DataProviders.begin(); i != DataProviders.end(); )
        {
                std::multimap<std::string, ServiceProvider*>::iterator curr = i++;
@@ -587,8 +594,7 @@ void ModuleManager::AddService(ServiceProvider& item)
                case SERVICE_MODE:
                {
                        ModeHandler* mh = static_cast<ModeHandler*>(&item);
-                       if (!ServerInstance->Modes->AddMode(mh))
-                               throw ModuleException("Mode "+std::string(item.name)+" already exists.");
+                       ServerInstance->Modes->AddMode(mh);
                        DataProviders.insert(std::make_pair((mh->GetModeType() == MODETYPE_CHANNEL ? "mode/" : "umode/") + item.name, &item));
                        dynamic_reference_base::reset_all();
                        return;