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

Partialy fixed interaction with Armor Stand

Browse source
This commit is contained in:
Anon 2023-03-30 21:06:54 +02:00
parent bbb3b1e38a
commit db6422d154
2 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
MinecraftClient/Commands/Entitycmd.cs
View file

@ -314,7 +314,11 @@ namespace MinecraftClient.Commands
handler.InteractEntity(entity.ID, InteractType.Attack); handler.InteractEntity(entity.ID, InteractType.Attack);
return Translations.cmd_entityCmd_attacked; return Translations.cmd_entityCmd_attacked;
case ActionType.Use: case ActionType.Use:
handler.InteractEntity(entity.ID, InteractType.Interact); bool shouldInteractAt = entity.Type == EntityType.ArmorStand ||
entity.Type == EntityType.ChestMinecart ||
entity.Type == EntityType.ChestBoat;
handler.InteractEntity(entity.ID, shouldInteractAt ? InteractType.InteractAt : InteractType.Interact);
return Translations.cmd_entityCmd_used; return Translations.cmd_entityCmd_used;
case ActionType.List: case ActionType.List:
return GetEntityInfoDetailed(handler, entity); return GetEntityInfoDetailed(handler, entity);

24
MinecraftClient/McClient.cs
View file

@ -2195,16 +2195,26 @@ namespace MinecraftClient
if (entities.ContainsKey(entityID)) if (entities.ContainsKey(entityID))
{ {
if (type == InteractType.Interact) switch (type)
{ {
return handler.SendInteractEntity(entityID, (int)type, (int)hand); case InteractType.Interact:
} return handler.SendInteractEntity(entityID, (int)type, (int)hand);
else
{ case InteractType.InteractAt:
return handler.SendInteractEntity(entityID, (int)type); return handler.SendInteractEntity(
EntityID: entityID,
type: (int)type,
X: (float)entities[entityID].Location.X,
Y: (float)entities[entityID].Location.Y,
Z: (float)entities[entityID].Location.Z,
hand: (int)hand);
default:
return handler.SendInteractEntity(entityID, (int)type);
} }
} }
else return false;
return false;
} }
/// <summary> /// <summary>