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

add tell async and update SharedLibraryCore version

Browse Source
This commit is contained in:
RaidMax
2022-03-23 11:38:09 -05:00
parent 7a1ed90f06
commit 932bc77798
6 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
SharedLibraryCore/Commands/NativeCommands.cs
View File

@ -709,37 +709,35 @@ namespace SharedLibraryCore.Commands
RequiresTarget = false;
}
public override Task ExecuteAsync(GameEvent E)
public override async Task ExecuteAsync(GameEvent gameEvent)
{
if (E.Owner.Manager.GetApplicationSettings().Configuration().GlobalRules?.Length < 1 &&
E.Owner.ServerConfig.Rules?.Length < 1)
if (gameEvent.Owner.Manager.GetApplicationSettings().Configuration().GlobalRules?.Length < 1 &&
gameEvent.Owner.ServerConfig.Rules?.Length < 1)
{
var _ = E.Message.IsBroadcastCommand(_config.BroadcastCommandPrefix)
? E.Owner.Broadcast(_translationLookup["COMMANDS_RULES_NONE"])
: E.Origin.Tell(_translationLookup["COMMANDS_RULES_NONE"]);
var _ = gameEvent.Message.IsBroadcastCommand(_config.BroadcastCommandPrefix)
? gameEvent.Owner.Broadcast(_translationLookup["COMMANDS_RULES_NONE"])
: gameEvent.Origin.Tell(_translationLookup["COMMANDS_RULES_NONE"]);
}
else
{
var rules = new List<string>();
rules.AddRange(E.Owner.Manager.GetApplicationSettings().Configuration().GlobalRules);
if (E.Owner.ServerConfig.Rules != null)
rules.AddRange(gameEvent.Owner.Manager.GetApplicationSettings().Configuration().GlobalRules);
if (gameEvent.Owner.ServerConfig.Rules != null)
{
rules.AddRange(E.Owner.ServerConfig.Rules);
rules.AddRange(gameEvent.Owner.ServerConfig.Rules);
}
var ruleFomat = rules.Select(r => $"- {r}");
if (E.Message.IsBroadcastCommand(_config.BroadcastCommandPrefix))
var ruleFormat = rules.Select(r => $"- {r}");
if (gameEvent.Message.IsBroadcastCommand(_config.BroadcastCommandPrefix))
{
E.Owner.Broadcast(ruleFomat);
gameEvent.Owner.Broadcast(ruleFormat);
}
else
{
E.Origin.Tell(ruleFomat);
await gameEvent.Origin.TellAsync(ruleFormat, gameEvent.Owner.Manager.CancellationToken);
}
}
return Task.CompletedTask;
}
}