1
0
mirror of https://github.com/anope/anope.git synced 2026-07-09 05:03:14 +02:00

Merge branch '2.0' into 2.1.

This commit is contained in:
Sadie Powell
2024-10-11 16:55:36 +01:00
+6 -4
View File
@@ -513,12 +513,13 @@ public:
/* Set the perm mode */
if (cm)
{
if (ci->c && !ci->c->HasMode("PERM"))
ci->c->SetMode(NULL, cm);
/* Add it to the channels mlock */
ModeLocks *ml = ci->Require<ModeLocks>("modelocks");
if (ml)
ml->SetMLock(cm, true, "", source.GetNick());
if (ci->c && !ci->c->HasMode("PERM"))
ci->c->SetMode(NULL, cm);
}
/* No botserv bot, no channel mode, give them ChanServ.
* Yes, this works fine with no BotServ.
@@ -556,12 +557,13 @@ public:
/* Unset perm mode */
if (cm)
{
if (ci->c && ci->c->HasMode("PERM"))
ci->c->RemoveMode(NULL, cm);
/* Remove from mlock */
ModeLocks *ml = ci->GetExt<ModeLocks>("modelocks");
if (ml)
ml->RemoveMLock(cm, true);
if (ci->c && ci->c->HasMode("PERM"))
ci->c->RemoveMode(NULL, cm);
}
/* No channel mode, no BotServ, but using ChanServ as the botserv bot
* which was assigned when persist was set on