pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-12 18:54:47 +02:00
Code Activity

Use ProtocolException instead of setting Quitting manually.

Browse Source
This commit is contained in:
Sadie Powell
2026-03-26 12:06:25 +00:00
parent b199d74088
commit 1b2b4386c1
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/protocol/inspircd.cpp
+1 -5
View File
@@ -1768,11 +1768,7 @@ struct IRCDMessageSave final
if (targ->server == Me && (bi = dynamic_cast<BotInfo *>(targ)))
{
if (last_collide == Anope::CurTime)
{
Anope::QuitReason = "Nick collision fight on " + targ->nick;
Anope::Quitting = true;
return;
}
throw ProtocolException("Nick collision fight on " + targ->nick);
IRCD->SendKill(Me, targ->nick, "Nick collision");
IRCD->SendNickChange(targ, targ->nick);
src/messages.cpp
+2 -5
View File
@@ -208,11 +208,8 @@ void Kill::Run(MessageSource &source, const std::vector<Anope::string> &params,
static time_t last_time = 0;
if (last_time == Anope::CurTime)
{
Anope::QuitReason = "Kill loop detected. Is Anope U:Lined?";
Anope::Quitting = true;
return;
}
throw ProtocolException("Kill loop detected. Is Anope U:Lined?");
last_time = Anope::CurTime;
bi->OnKill();