themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

PlayerCommandEventArgs passes the command prefix

Browse source 
Fix tab space conflict in PlayerHooks.cs
This commit is contained in:
Lucas Nicodemus 2015-03-08 16:00:43 -06:00
parent 02564b5f9c
commit 32218f9be0
2 changed files with 67 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/Commands.cs
View file

@ -623,7 +623,7 @@ namespace TShockAPI
IEnumerable<Command> cmds = ChatCommands.FindAll(c => c.HasAlias(cmdName)); IEnumerable<Command> cmds = ChatCommands.FindAll(c => c.HasAlias(cmdName));
if (Hooks.PlayerHooks.OnPlayerCommand(player, cmdName, cmdText, args, ref cmds)) if (Hooks.PlayerHooks.OnPlayerCommand(player, cmdName, cmdText, args, ref cmds, cmdPrefix))
return true; return true;
if (cmds.Count() == 0) if (cmds.Count() == 0)

7
TShockAPI/Hooks/PlayerHooks.cs
View file

@ -44,6 +44,7 @@ namespace TShockAPI.Hooks
public string CommandText { get; set; } public string CommandText { get; set; }
public List<string> Parameters { get; set; } public List<string> Parameters { get; set; }
public IEnumerable<Command> CommandList { get; set; } public IEnumerable<Command> CommandList { get; set; }
public string CommandPrefix { get; set; }
} }
public class PlayerChatEventArgs : HandledEventArgs public class PlayerChatEventArgs : HandledEventArgs
@ -78,7 +79,7 @@ namespace TShockAPI.Hooks
PlayerPostLogin(args); PlayerPostLogin(args);
} }
public static bool OnPlayerCommand(TSPlayer player, string cmdName, string cmdText, List<string> args, ref IEnumerable<Command> commands) public static bool OnPlayerCommand(TSPlayer player, string cmdName, string cmdText, List<string> args, ref IEnumerable<Command> commands, string cmdPrefix)
{ {
if (PlayerCommand == null) if (PlayerCommand == null)
{ {
@ -90,10 +91,10 @@ namespace TShockAPI.Hooks
CommandName = cmdName, CommandName = cmdName,
CommandText = cmdText, CommandText = cmdText,
Parameters = args, Parameters = args,
CommandList = commands CommandList = commands,
CommandPrefix = cmdPrefix,
}; };
PlayerCommand(playerCommandEventArgs); PlayerCommand(playerCommandEventArgs);
commands = playerCommandEventArgs.CommandList;
return playerCommandEventArgs.Handled; return playerCommandEventArgs.Handled;
} }