aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/coremods/core_channel/core_channel.cpp5
-rw-r--r--src/modules/m_clearchan.cpp3
2 files changed, 3 insertions, 5 deletions
diff --git a/src/coremods/core_channel/core_channel.cpp b/src/coremods/core_channel/core_channel.cpp
index 4338de934..dcfc8f739 100644
--- a/src/coremods/core_channel/core_channel.cpp
+++ b/src/coremods/core_channel/core_channel.cpp
@@ -198,10 +198,7 @@ class CoreModChannel
if (optionstag->getBool("invitebypassmodes", true))
ServerInstance->Modules.Attach(events, this, sizeof(events)/sizeof(Implementation));
else
- {
- for (unsigned int i = 0; i < sizeof(events)/sizeof(Implementation); i++)
- ServerInstance->Modules.Detach(events[i], this);
- }
+ ServerInstance->Modules.Detach(events, this, sizeof(events)/sizeof(Implementation));
auto limitstag = ServerInstance->Config->ConfValue("limits");
keymode.maxkeylen = limitstag->getUInt("maxkey", 32, 1, ModeParser::MODE_PARAM_MAX);
diff --git a/src/modules/m_clearchan.cpp b/src/modules/m_clearchan.cpp
index 7d726fafd..b8710a56a 100644
--- a/src/modules/m_clearchan.cpp
+++ b/src/modules/m_clearchan.cpp
@@ -157,7 +157,8 @@ class ModuleClearChan : public Module
void init() override
{
// Only attached while we are working; don't react to events otherwise
- ServerInstance->Modules.DetachAll(this);
+ Implementation events[] = { I_OnBuildNeighborList, I_OnUserKick };
+ ServerInstance->Modules.Detach(events, this, sizeof(events)/sizeof(Implementation));
}
void OnBuildNeighborList(User* source, IncludeChanList& include, std::map<User*, bool>& exception) override