Store oper types and opers in separate containers

2 files changed, 4 insertions, 4 deletions

diff --git a/src/modules/m_spanningtree/opertype.cpp b/src/modules/m_spanningtree/opertype.cpp
index 9e8c8ed9d..6402b89dc 100644
--- a/src/modules/m_spanningtree/opertype.cpp
+++ b/src/modules/m_spanningtree/opertype.cpp
@@ -36,8 +36,8 @@ CmdResult CommandOpertype::Handle(const std::vector<std::string>& params, User *
 	ModeHandler* opermh = ServerInstance->Modes->FindMode('o', MODETYPE_USER);
 	u->SetMode(opermh, true);
 
-	OperIndex::iterator iter = ServerInstance->Config->oper_blocks.find(" " + opertype);
-	if (iter != ServerInstance->Config->oper_blocks.end())
+	OperIndex::iterator iter = ServerInstance->Config->OperTypes.find(opertype);
+	if (iter != ServerInstance->Config->OperTypes.end())
 		u->oper = iter->second;
 	else
 	{
diff --git a/src/modules/m_sqloper.cpp b/src/modules/m_sqloper.cpp
index b9a883043..295f4aa94 100644
--- a/src/modules/m_sqloper.cpp
+++ b/src/modules/m_sqloper.cpp
@@ -78,8 +78,8 @@ class OpMeQuery : public SQLQuery
 
 	bool OperUser(User* user, const std::string &pattern, const std::string &type)
 	{
-		OperIndex::iterator iter = ServerInstance->Config->oper_blocks.find(" " + type);
-		if (iter == ServerInstance->Config->oper_blocks.end())
+		OperIndex::iterator iter = ServerInstance->Config->OperTypes.find(type);
+		if (iter == ServerInstance->Config->OperTypes.end())
 		{
 			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "bad type '%s' in returned row for oper %s", type.c_str(), username.c_str());
 			return false;