helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-10-14 21:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Entitycmd: Replace Parse with TryParse

Browse source
This commit is contained in:
BruceChen 2022-11-25 10:30:51 +08:00
parent 30861a92ee
commit f6a11dffdf
1 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

19
MinecraftClient/Commands/Entitycmd.cs
View file

@ -99,9 +99,8 @@ namespace MinecraftClient.Commands
string[] args = GetArgs(command); string[] args = GetArgs(command);
if (args.Length >= 1) if (args.Length >= 1)
{ {
try if (int.TryParse(args[0], NumberStyles.Any, CultureInfo.CurrentCulture, out int entityID))
{ {
int entityID = int.Parse(args[0], NumberStyles.Any, CultureInfo.CurrentCulture);
if (handler.GetEntities().ContainsKey(entityID)) if (handler.GetEntities().ContainsKey(entityID))
{ {
string action = args.Length > 1 string action = args.Length > 1
@ -124,22 +123,13 @@ namespace MinecraftClient.Commands
} }
else return Translations.cmd_entityCmd_not_found; else return Translations.cmd_entityCmd_not_found;
} }
catch (FormatException) else if (Enum.TryParse(args[0], true, out EntityType interacttype))
{ {
EntityType interacttype;
try
{
interacttype = Enum.Parse<EntityType>(args[0]);
}
catch (Exception)
{
return Translations.cmd_entityCmd_not_found;
}
string action = args.Length > 1 string action = args.Length > 1
? args[1].ToLower() ? args[1].ToLower()
: "list"; : "list";
if (action == "attack" || action == "use") { if (action == "attack" || action == "use")
{
string actionst = Translations.cmd_entityCmd_attacked; string actionst = Translations.cmd_entityCmd_attacked;
int actioncount = 0; int actioncount = 0;
foreach (var entity2 in handler.GetEntities()) foreach (var entity2 in handler.GetEntities())
@ -176,6 +166,7 @@ namespace MinecraftClient.Commands
response.Append(GetCmdDescTranslated()); response.Append(GetCmdDescTranslated());
return response.ToString(); return response.ToString();
} }
else return GetCmdDescTranslated();
} }
else else
{ {