vulpineawoo/solanum
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Unify oper:{global,local}_kill

Browse source
This commit is contained in:
Ed Kellett 2020-10-24 23:49:28 +01:00
parent 8a776ce65c
commit 7d84719d68
8 changed files with 18 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/core/m_kill.c
View file

@ -78,9 +78,9 @@ mo_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
user = parv[1];
if(!IsOperLocalKill(source_p))
if(!IsOperKill(source_p))
{
sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "local_kill");
sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "kill");
return;
}
@ -114,14 +114,6 @@ mo_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
sendto_one_notice(source_p, ":KILL changed from %s to %s", user, target_p->name);
}
if(!MyConnect(target_p) && (!IsOperGlobalKill(source_p)))
{
sendto_one_notice(source_p, ":Nick %s is not on your server "
"and you do not have the global_kill flag",
target_p->name);
return;
}
/* Last chance to stop the kill */
moduledata.client = source_p;
moduledata.target = target_p;