diff --git a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs index 1d785fb3db..ec9e7b7322 100644 --- a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs @@ -48,17 +48,6 @@ namespace Content.Server.GameObjects.EntitySystems #region Tools - /// - /// This interface gives components behavior when being clicked on or "attacked" by a user with a tool in their hand - /// - public interface IToolAct - { - /// - /// Called when using a tool on an entity - /// - bool ToolAct(ToolActEventArgs eventArgs) => false; - } - public class ToolActEventArgs : EventArgs { public IEntity User { get; set; } @@ -71,7 +60,7 @@ namespace Content.Server.GameObjects.EntitySystems /// /// This interface gives components behavior when being clicked on or "attacked" by a user with a wrench in their hand /// - public interface IWrenchAct : IToolAct + public interface IWrenchAct { /// /// Called when using a wrench on an entity @@ -87,7 +76,7 @@ namespace Content.Server.GameObjects.EntitySystems /// /// This interface gives components behavior when being clicked on or "attacked" by a user with a crowbar in their hand /// - public interface ICrowbarAct : IToolAct + public interface ICrowbarAct { /// /// Called when using a wrench on an entity @@ -694,11 +683,6 @@ namespace Content.Server.GameObjects.EntitySystems // We handle specific tools AttackBy here. if (weapon.TryGetComponent(out var tool)) { - - if (attacked.GetAllComponents().Any((act => act.ToolAct(new ToolActEventArgs() - {User = user, ClickLocation = clickLocation, AttackWith = weapon})))) - return; - switch (tool.Behavior) { case Tool.Wrench: