Add an effect that shows the item you're using to attack with when attacking

2020-08-31 20:54:33 +02:00
parent b927fddf4c
commit 391444c879
5 changed files with 45 additions and 11 deletions
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAttack.cs
+++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAttack.cs
@@ -32,6 +32,6 @@ namespace Content.Shared.Interfaces.GameObjects.Components
        public GridCoordinates ClickLocation { get; }
        public bool WideAttack { get; }
        public EntityUid Target { get; }
-        public IEntity? TargetEntity => IoCManager.Resolve<IEntityManager>()?.GetEntity(Target) ?? null;
+        public IEntity? TargetEntity => Target.IsValid() ? IoCManager.Resolve<IEntityManager>()?.GetEntity(Target) ?? null : null;
    }
 }