INSANEMODE/IW4M-Admin
1
0
Fork 0
mirror of https://github.com/RaidMax/IW4M-Admin.git synced 2025-06-12 08:08:06 -05:00
Code Issues Releases Wiki Activity

Fix self-targeting

Browse Source 
Remove creation of penalty on mute expiration
This commit is contained in:
Amos
2022-10-14 15:21:18 +01:00
committed by RaidMax
parent bfad75d7eb
commit fe08463e2c
4 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Plugins/Mute/Commands/MuteCommand.cs
View File

@ -34,6 +34,12 @@ public class MuteCommand : Command
public override async Task ExecuteAsync(GameEvent gameEvent) public override async Task ExecuteAsync(GameEvent gameEvent)
{ {
if (gameEvent.Origin.ClientId == gameEvent.Target.ClientId)
{
gameEvent.Origin.Tell(_translationLookup["PLUGINS_MUTE_SELF_TARGET"]);
return;
}
if (await Plugin.MuteManager.Mute(gameEvent.Owner, gameEvent.Origin, gameEvent.Target, null, gameEvent.Data)) if (await Plugin.MuteManager.Mute(gameEvent.Owner, gameEvent.Origin, gameEvent.Target, null, gameEvent.Data))
{ {
gameEvent.Origin.Tell(_translationLookup["PLUGINS_MUTE_COMMANDS_MUTE_MUTED"] gameEvent.Origin.Tell(_translationLookup["PLUGINS_MUTE_COMMANDS_MUTE_MUTED"]

6
Plugins/Mute/Commands/TempMuteCommand.cs
View File

@ -42,6 +42,12 @@ public class TempMuteCommand : Command
public override async Task ExecuteAsync(GameEvent gameEvent) public override async Task ExecuteAsync(GameEvent gameEvent)
{ {
if (gameEvent.Origin.ClientId == gameEvent.Target.ClientId)
{
gameEvent.Origin.Tell(_translationLookup["PLUGINS_MUTE_SELF_TARGET"]);
return;
}
var match = Regex.Match(gameEvent.Data, TempBanRegex); var match = Regex.Match(gameEvent.Data, TempBanRegex);
if (match.Success) if (match.Success)
{ {

6
Plugins/Mute/Commands/UnmuteCommand.cs
View File

@ -34,6 +34,12 @@ public class UnmuteCommand : Command
public override async Task ExecuteAsync(GameEvent gameEvent) public override async Task ExecuteAsync(GameEvent gameEvent)
{ {
if (gameEvent.Origin.ClientId == gameEvent.Target.ClientId)
{
gameEvent.Origin.Tell(_translationLookup["PLUGINS_MUTE_SELF_TARGET"]);
return;
}
if (await Plugin.MuteManager.Unmute(gameEvent.Owner, gameEvent.Origin, gameEvent.Target, gameEvent.Data)) if (await Plugin.MuteManager.Unmute(gameEvent.Owner, gameEvent.Origin, gameEvent.Target, gameEvent.Data))
{ {
gameEvent.Origin.Tell(_translationLookup["PLUGINS_MUTE_COMMANDS_UNMUTE_UNMUTED"] gameEvent.Origin.Tell(_translationLookup["PLUGINS_MUTE_COMMANDS_UNMUTE_UNMUTED"]

2
Plugins/Mute/MuteManager.cs
View File

@ -98,7 +98,7 @@ public class MuteManager
if (clientMuteMeta.MuteState is MuteState.Unmuted && clientMuteMeta.CommandExecuted) return false; if (clientMuteMeta.MuteState is MuteState.Unmuted && clientMuteMeta.CommandExecuted) return false;
if (!target.IsIngame && clientMuteMeta.MuteState is MuteState.Unmuting) return false; if (!target.IsIngame && clientMuteMeta.MuteState is MuteState.Unmuting) return false;
if (clientMuteMeta.MuteState is not MuteState.Unmuting) if (clientMuteMeta.MuteState is not MuteState.Unmuting || origin.ClientId != 1)
{ {
await CreatePenalty(MuteState.Unmuted, origin, target, DateTime.UtcNow, reason); await CreatePenalty(MuteState.Unmuted, origin, target, DateTime.UtcNow, reason);
} }