fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix up the penalty system. stealth mutes are now actually stealthed properly, user bans no longer confuse removeip. Added stealthmute command for convienience.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6326 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2023-01-09 05:13:33 +00:00
parent fb9f8c9cd8
commit 268b28a25d
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
engine/server/sv_ccmds.c
View file

@ -1230,6 +1230,7 @@ static netadr_t *NET_IPV4ify(netadr_t *a, netadr_t *tmp)
tmp->connum = a->connum;
tmp->scopeid = a->scopeid;
tmp->port = a->port;
tmp->prot = a->prot;
tmp->address.ip[0] = a->address.ip6[12];
tmp->address.ip[1] = a->address.ip6[13];
tmp->address.ip[2] = a->address.ip6[14];
@ -1310,7 +1311,7 @@ void SV_EvaluatePenalties(client_t *cl)
if (((penalties|delta) & (BAN_MUTE|BAN_DEAF)) == (BAN_MUTE|BAN_DEAF))
delta &= ~(BAN_MUTE|BAN_DEAF);
if (penalties & BAN_STEALTH)
if ((delta|penalties) & BAN_STEALTH)
delta = 0; //don't announce ANY.
if (cl->controller)
@ -1772,10 +1773,11 @@ static void SV_PenaltyToggle (unsigned int banflag, char *penaltyname)
char *clname = Cmd_Argv(1);
char *duration = Cmd_Argv(2);
char *reason = Cmd_Argv(3);
bannedips_t proto;
bannedips_t proto = {0};
client_t *cl;
qboolean found = false;
int clnum=-1;
netadr_t tmp;
proto.banflags = banflag;
@ -1794,9 +1796,9 @@ static void SV_PenaltyToggle (unsigned int banflag, char *penaltyname)
while((cl = SV_GetClientForString(clname, &clnum)))
{
found = true;
proto.adr = cl->netchan.remote_address;
proto.adr = *NET_IPV4ify(&cl->netchan.remote_address, &tmp);
proto.adr.port = 0;
proto.adrmask.type = cl->netchan.remote_address.type;
proto.adrmask.type = proto.adr.type;
if (NET_IsLoopBackAddress(&proto.adr) && (proto.banflags & BAN_NOLOCALHOST))
{
@ -1915,6 +1917,10 @@ static void SV_Mute_f (void)
{
SV_PenaltyToggle(BAN_MUTE, "muted");
}
static void SV_StealthMute_f (void)
{
SV_PenaltyToggle(BAN_MUTE|BAN_STEALTH, "stealth-muted");
}
static void SV_Cuff_f (void)
{
@ -3360,10 +3366,11 @@ void SV_InitOperatorCommands (void)
Cmd_AddCommand ("kick", SV_Kick_f);
Cmd_AddCommand ("clientkick", SV_KickSlot_f);
Cmd_AddCommand ("renameclient", SV_ForceName_f);
Cmd_AddCommand ("mute", SV_Mute_f);
Cmd_AddCommand ("cuff", SV_Cuff_f);
Cmd_AddCommand ("cripple", SV_CripplePlayer_f);
Cmd_AddCommand ("ban", SV_BanClientIP_f);
Cmd_AddCommandD ("mute", SV_Mute_f, "Mutes the player, shaming them.");
Cmd_AddCommandD ("stealthmute", SV_StealthMute_f, "Mutes the player, without telling them, while pretending that their messages are still being broadcast. For use against people that would escalate on expiry or externally.");
Cmd_AddCommandD ("cuff", SV_Cuff_f, "Slap handcuffs on the player, preventing them from being able to attack.");
Cmd_AddCommandD ("cripple", SV_CripplePlayer_f, "Block the player's ability to move.");
Cmd_AddCommandD ("ban", SV_BanClientIP_f, "Block the player's IP, preventing them from connecting. Also kicks them.");
Cmd_AddCommand ("banname", SV_BanClientIP_f); //legacy dupe-name crap
Cmd_AddCommand ("banlist", SV_BanList_f); //shows only bans, not other penalties