From fb2145fae887d70ff56ae6a9321076abfe060aed Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 30 Jan 2022 03:58:19 +1100 Subject: [PATCH] Remove IThrown (#6375) --- .../Interaction/SharedInteractionSystem.cs | 8 ------- Content.Shared/Throwing/IThrown.cs | 22 ------------------- 2 files changed, 30 deletions(-) diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs index 3296a2f0ef..2440faacbb 100644 --- a/Content.Shared/Interaction/SharedInteractionSystem.cs +++ b/Content.Shared/Interaction/SharedInteractionSystem.cs @@ -719,14 +719,6 @@ namespace Content.Shared.Interaction return; } - var comps = AllComps(thrown).ToList(); - var args = new ThrownEventArgs(user); - - // Call Thrown on all components that implement the interface - foreach (var comp in comps) - { - comp.Thrown(args); - } _adminLogSystem.Add(LogType.Throw, LogImpact.Low,$"{ToPrettyString(user):user} threw {ToPrettyString(thrown):entity}"); } #endregion diff --git a/Content.Shared/Throwing/IThrown.cs b/Content.Shared/Throwing/IThrown.cs index 6d26a0d8b9..f0e474ac86 100644 --- a/Content.Shared/Throwing/IThrown.cs +++ b/Content.Shared/Throwing/IThrown.cs @@ -1,30 +1,8 @@ -using System; using JetBrains.Annotations; -using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; namespace Content.Shared.Throwing { - /// - /// This interface gives components behavior when thrown. - /// - [RequiresExplicitImplementation] - public interface IThrown - { - [Obsolete("Use ThrownMessage instead")] - void Thrown(ThrownEventArgs eventArgs); - } - - public class ThrownEventArgs : EventArgs - { - public ThrownEventArgs(EntityUid user) - { - User = user; - } - - public EntityUid User { get; } - } - /// /// Raised when throwing the entity in your hands. ///