Minor spelling errors in m_spanningtree.so

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

diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp
index 34d782c7718eeb7ed243b812e3ad6223a79a7c84..20d4c8e8faeeed905350aac88dfc2eb79c90b511 100644 (file)
--- a/src/modules/m_delayjoin.cpp
+++ b/src/modules/m_delayjoin.cpp
@@ -45,10 +45,14 @@ class ModuleDelayJoin : public Module
        LocalIntExt unjoined;
        ModuleDelayJoin() : djm(this), unjoined("delayjoin", this)
        {
-               if (!ServerInstance->Modes->AddMode(&djm))
-                       throw ModuleException("Could not add new modes!");
+       }
+
+       void init()
+       {
+               ServerInstance->Modules->AddService(djm);
+               ServerInstance->Modules->AddService(unjoined);
                Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnBuildNeighborList, I_OnNamesListItem, I_OnText, I_OnRawMode };
-               ServerInstance->Modules->Attach(eventlist, this, 7);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
        ~ModuleDelayJoin();
        Version GetVersion();
@@ -178,6 +182,11 @@ ModResult ModuleDelayJoin::OnRawMode(User* user, Channel* channel, const char mo
        if (!user || !channel || param.empty())
                return MOD_RES_PASSTHRU;
 
+       ModeHandler* mh = ServerInstance->Modes->FindMode(mode, MODETYPE_CHANNEL);
+       // If not a prefix mode then we got nothing to do here
+       if (!mh || !mh->GetPrefixRank())
+               return MOD_RES_PASSTHRU;
+
        User* dest;
        if (IS_LOCAL(user))
                dest = ServerInstance->FindNickOnly(param);