Mirrors/SanAndreasUnity
2
0
Fork 0
mirror of https://github.com/GTA-ASM/SanAndreasUnity synced 2025-02-17 05:18:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

add player to ProcessCommandContext

Browse source
This commit is contained in:
in0finite 2021-02-21 00:46:48 +01:00
parent 3aef4d8559
commit fb1212305c
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Assets/Scripts/Commands/CommandManager.cs
View file

@ -49,6 +49,7 @@ namespace SanAndreasUnity.Commands
{ {
public string command; public string command;
public bool hasServerPermissions; public bool hasServerPermissions;
public Player player;
} }
@ -101,35 +102,38 @@ namespace SanAndreasUnity.Commands
return string.Join(" ", args, argumentIndex + 1, args.Length - argumentIndex - 1); return string.Join(" ", args, argumentIndex + 1, args.Length - argumentIndex - 1);
} }
ProcessCommandResult ProcessCommand(string command, bool hasServerPermissions) ProcessCommandResult ProcessCommand(ProcessCommandContext context)
{ {
if (string.IsNullOrWhiteSpace(command)) if (string.IsNullOrWhiteSpace(context.command))
return ProcessCommandResult.UnknownCommand; return ProcessCommandResult.UnknownCommand;
string[] arguments = SplitCommandIntoArguments(command); string[] arguments = SplitCommandIntoArguments(context.command);
if (0 == arguments.Length) if (0 == arguments.Length)
return ProcessCommandResult.InvalidCommand; return ProcessCommandResult.InvalidCommand;
if (!m_registeredCommands.TryGetValue(arguments[0], out CommandInfo commandInfo)) if (!m_registeredCommands.TryGetValue(arguments[0], out CommandInfo commandInfo))
return ProcessCommandResult.UnknownCommand; return ProcessCommandResult.UnknownCommand;
if (!hasServerPermissions && !commandInfo.allowToRunWithoutServerPermissions) if (!context.hasServerPermissions && !commandInfo.allowToRunWithoutServerPermissions)
return ProcessCommandResult.NoPermissions; return ProcessCommandResult.NoPermissions;
var context = new ProcessCommandContext {command = command, hasServerPermissions = hasServerPermissions};
return commandInfo.commandHandler(context); return commandInfo.commandHandler(context);
} }
public ProcessCommandResult ProcessCommandAsServer(string command) public ProcessCommandResult ProcessCommandAsServer(string command)
{ {
return ProcessCommand(command, true); return ProcessCommand(new ProcessCommandContext {command = command, hasServerPermissions = true});
} }
public ProcessCommandResult ProcessCommandForPlayer(Player player, string command) public ProcessCommandResult ProcessCommandForPlayer(Player player, string command)
{ {
bool hasServerPermissions = player == Player.Local; bool hasServerPermissions = player == Player.Local;
return ProcessCommand(command, hasServerPermissions); return ProcessCommand(new ProcessCommandContext
{
command = command,
hasServerPermissions = hasServerPermissions,
player = player,
});
} }
ProcessCommandResult ProcessHelpCommand(ProcessCommandContext context) ProcessCommandResult ProcessHelpCommand(ProcessCommandContext context)