Reset the already_sent IDs during slow garbage collection

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

diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index 7a18991c1afc48cb7da54bb1a05120b3fb68622e..11a82901b9371642b61e4a677d0a167a0b060dea 100644 (file)
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -42,16 +42,8 @@ class ModuleOperLevels : public Module
                        // oper killing an oper?
                        if (IS_OPER(dest) && IS_OPER(source))
                        {
-                               TagIndex::iterator dest_type = ServerInstance->Config->opertypes.find(dest->oper);
-                               TagIndex::iterator src_type = ServerInstance->Config->opertypes.find(source->oper);
-
-                               if (dest_type == ServerInstance->Config->opertypes.end())
-                                       return MOD_RES_PASSTHRU;
-                               if (src_type == ServerInstance->Config->opertypes.end())
-                                       return MOD_RES_PASSTHRU;
-
-                               long dest_level = dest_type->second->getInt("level");
-                               long source_level = src_type->second->getInt("level");
+                               long dest_level = atol(dest->oper->getConfig("level").c_str());
+                               long source_level = atol(source->oper->getConfig("level").c_str());
                                if (dest_level > source_level)
                                {
                                        if (IS_LOCAL(source)) ServerInstance->SNO->WriteGlobalSno('a', "Oper %s (level %ld) attempted to /kill a higher oper: %s (level %ld): Reason: %s",source->nick.c_str(),source_level,dest->nick.c_str(),dest_level,reason.c_str());