diff --git a/Content.Client/GameObjects/Components/Doors/ClientDoorComponent.cs b/Content.Client/GameObjects/Components/Doors/ClientDoorComponent.cs index 82b81a376a..f24db36a46 100644 --- a/Content.Client/GameObjects/Components/Doors/ClientDoorComponent.cs +++ b/Content.Client/GameObjects/Components/Doors/ClientDoorComponent.cs @@ -88,7 +88,7 @@ namespace Content.Client.GameObjects.Components.Doors } } - public sealed class DoorStateMessage : EntitySystemMessage + public sealed class DoorStateMessage : EntityEventArgs { public ClientDoorComponent Component { get; } public SharedDoorComponent.DoorState State { get; } diff --git a/Content.Client/GameObjects/Components/SubFloorHideComponent.cs b/Content.Client/GameObjects/Components/SubFloorHideComponent.cs index 5f2318bc75..dfee4d169d 100644 --- a/Content.Client/GameObjects/Components/SubFloorHideComponent.cs +++ b/Content.Client/GameObjects/Components/SubFloorHideComponent.cs @@ -52,7 +52,7 @@ namespace Content.Client.GameObjects.Components } } - internal sealed class SubFloorHideDirtyEvent : EntitySystemMessage + internal sealed class SubFloorHideDirtyEvent : EntityEventArgs { public IEntity Sender { get; } diff --git a/Content.Client/GameObjects/EntitySystems/IconSmoothSystem.cs b/Content.Client/GameObjects/EntitySystems/IconSmoothSystem.cs index fc6d599739..b2c909181f 100644 --- a/Content.Client/GameObjects/EntitySystems/IconSmoothSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/IconSmoothSystem.cs @@ -129,7 +129,7 @@ namespace Content.Client.GameObjects.EntitySystems /// /// Event raised by a when it needs to be recalculated. /// - public sealed class IconSmoothDirtyEvent : EntitySystemMessage + public sealed class IconSmoothDirtyEvent : EntityEventArgs { public IconSmoothDirtyEvent(IEntity sender, (GridId grid, Vector2i pos)? lastPosition, SnapGridOffset offset, IconSmoothingMode mode) { diff --git a/Content.Client/GameObjects/EntitySystems/WindowSystem.cs b/Content.Client/GameObjects/EntitySystems/WindowSystem.cs index 0fc84e7049..234c90073f 100644 --- a/Content.Client/GameObjects/EntitySystems/WindowSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/WindowSystem.cs @@ -46,7 +46,7 @@ namespace Content.Client.GameObjects.EntitySystems /// /// Event raised by a when it needs to be recalculated. /// - public sealed class WindowSmoothDirtyEvent : EntitySystemMessage + public sealed class WindowSmoothDirtyEvent : EntityEventArgs { public IEntity Sender { get; } diff --git a/Content.Client/State/OutlineToggleMessage.cs b/Content.Client/State/OutlineToggleMessage.cs index bef225fda4..bf7bcbe74d 100644 --- a/Content.Client/State/OutlineToggleMessage.cs +++ b/Content.Client/State/OutlineToggleMessage.cs @@ -2,7 +2,7 @@ namespace Content.Client.State { - public sealed class OutlineToggleMessage : EntitySystemMessage + public sealed class OutlineToggleMessage : EntityEventArgs { public bool Enabled { get; } diff --git a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs index 7219ef5524..80694f79b8 100644 --- a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs +++ b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs @@ -460,7 +460,7 @@ namespace Content.IntegrationTests.Tests.Networking } } - private sealed class SetFooMessage : EntitySystemMessage + private sealed class SetFooMessage : EntityEventArgs { public SetFooMessage(EntityUid uid, bool newFoo) { diff --git a/Content.Server/GameObjects/Components/Access/AccessReaderChangeMessage.cs b/Content.Server/GameObjects/Components/Access/AccessReaderChangeMessage.cs index ec26dea010..ff919d3944 100644 --- a/Content.Server/GameObjects/Components/Access/AccessReaderChangeMessage.cs +++ b/Content.Server/GameObjects/Components/Access/AccessReaderChangeMessage.cs @@ -2,7 +2,7 @@ using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.Components.Access { - public sealed class AccessReaderChangeMessage : EntitySystemMessage + public sealed class AccessReaderChangeMessage : EntityEventArgs { public IEntity Sender { get; } diff --git a/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs b/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs index 0d72aed905..2f9333317e 100644 --- a/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs +++ b/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using System; using System.Diagnostics.CodeAnalysis; using Content.Server.GameObjects.Components.GUI; @@ -33,7 +33,7 @@ namespace Content.Server.GameObjects.Components.Buckle /// [RegisterComponent] [ComponentReference(typeof(SharedBuckleComponent))] - public class BuckleComponent : SharedBuckleComponent, IInteractHand + public class BuckleComponent : SharedBuckleComponent { [Dependency] private readonly IGameTiming _gameTiming = default!; @@ -410,12 +410,7 @@ namespace Content.Server.GameObjects.Components.Buckle return new BuckleComponentState(Buckled, drawDepth, LastEntityBuckledTo, DontCollide); } - - bool IInteractHand.InteractHand(InteractHandEventArgs eventArgs) - { - return TryUnbuckle(eventArgs.User); - } - + public void Update() { if (!DontCollide || Physics == null) diff --git a/Content.Server/GameObjects/Components/GUI/HandsComponent.cs b/Content.Server/GameObjects/Components/GUI/HandsComponent.cs index b2cf42b3de..7f08b0dba7 100644 --- a/Content.Server/GameObjects/Components/GUI/HandsComponent.cs +++ b/Content.Server/GameObjects/Components/GUI/HandsComponent.cs @@ -839,7 +839,7 @@ namespace Content.Server.GameObjects.Components.GUI } } - public class HandCountChangedEvent : EntitySystemMessage + public class HandCountChangedEvent : EntityEventArgs { public HandCountChangedEvent(IEntity sender) { diff --git a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs index dee577215f..b8336c5afa 100644 --- a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs @@ -275,7 +275,7 @@ namespace Content.Server.GameObjects.Components.Interactable } } - internal sealed class ActivateHandheldLightMessage : EntitySystemMessage + internal sealed class ActivateHandheldLightMessage : EntityEventArgs { public HandheldLightComponent Component { get; } @@ -285,7 +285,7 @@ namespace Content.Server.GameObjects.Components.Interactable } } - internal sealed class DeactivateHandheldLightMessage : EntitySystemMessage + internal sealed class DeactivateHandheldLightMessage : EntityEventArgs { public HandheldLightComponent Component { get; } diff --git a/Content.Server/GameObjects/Components/Observer/GhostComponent.cs b/Content.Server/GameObjects/Components/Observer/GhostComponent.cs index e28df43a31..6c324f3421 100644 --- a/Content.Server/GameObjects/Components/Observer/GhostComponent.cs +++ b/Content.Server/GameObjects/Components/Observer/GhostComponent.cs @@ -180,7 +180,7 @@ namespace Content.Server.GameObjects.Components.Observer message.AddMarkup(Loc.GetString("Died [color=yellow]{0}[/color].", deathTimeInfo)); } - public class GhostReturnMessage : EntitySystemMessage + public class GhostReturnMessage : EntityEventArgs { public GhostReturnMessage(Mind sender) { diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/EmergencyLightComponent.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/EmergencyLightComponent.cs index 51df93cd4f..2abb7beae3 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/EmergencyLightComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/EmergencyLightComponent.cs @@ -167,7 +167,7 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerRece }; } - public sealed class EmergencyLightMessage : EntitySystemMessage + public sealed class EmergencyLightMessage : EntityEventArgs { public EmergencyLightComponent Component { get; } diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingChunk.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingChunk.cs index 7ca1c25ab9..ca49d26a04 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingChunk.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingChunk.cs @@ -9,7 +9,7 @@ using Robust.Shared.Timing; namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding { - public class PathfindingChunkUpdateMessage : EntitySystemMessage + public class PathfindingChunkUpdateMessage : EntityEventArgs { public PathfindingChunk Chunk { get; } diff --git a/Content.Server/GameObjects/EntitySystems/AI/SleepAiMessage.cs b/Content.Server/GameObjects/EntitySystems/AI/SleepAiMessage.cs index 614e2c27f9..5f7a19a2c3 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/SleepAiMessage.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/SleepAiMessage.cs @@ -7,7 +7,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI /// Indicates whether an AI should be updated by the AiSystem or not. /// Useful to sleep AI when they die or otherwise should be inactive. /// - internal sealed class SleepAiMessage : EntitySystemMessage + internal sealed class SleepAiMessage : EntityEventArgs { /// /// Sleep or awake. diff --git a/Content.Server/GameObjects/EntitySystems/BuckleSystem.cs b/Content.Server/GameObjects/EntitySystems/BuckleSystem.cs index 81aee0d17d..ccf4e09435 100644 --- a/Content.Server/GameObjects/EntitySystems/BuckleSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/BuckleSystem.cs @@ -1,7 +1,8 @@ -#nullable enable +#nullable enable using Content.Server.GameObjects.Components.Buckle; using Content.Server.GameObjects.Components.Strap; using Content.Server.GameObjects.EntitySystems.Click; +using Content.Shared.Interfaces.GameObjects.Components; using JetBrains.Annotations; using Robust.Server.GameObjects; using Robust.Shared.Containers; @@ -22,11 +23,18 @@ namespace Content.Server.GameObjects.EntitySystems SubscribeLocalEvent(MoveEvent); SubscribeLocalEvent(ContainerModified); SubscribeLocalEvent(ContainerModified); + + SubscribeLocalEvent(HandleAttackHand); + } + + private void HandleAttackHand(EntityUid uid, BuckleComponent component, AttackHandMessage args) + { + args.Handled = component.TryUnbuckle(args.User); } public override void Update(float frameTime) { - foreach (var comp in ComponentManager.EntityQuery(false)) + foreach (var comp in ComponentManager.EntityQuery()) { comp.Update(); } @@ -37,6 +45,7 @@ namespace Content.Server.GameObjects.EntitySystems base.Shutdown(); UnsubscribeLocalEvent(); + UnsubscribeLocalEvent(HandleAttackHand); } private void MoveEvent(MoveEvent ev) diff --git a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs index c6fe49f378..dc5d5d804e 100644 --- a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs @@ -73,6 +73,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click if (!interactionArgs.InRangeUnobstructed(ignoreInsideBlocker: true, popup: true)) return; // trigger dragdrops on the dropped entity + RaiseLocalEvent(dropped.Uid, interactionArgs); foreach (var dragDrop in dropped.GetAllComponents()) { if (dragDrop.CanDrop(interactionArgs) && @@ -83,6 +84,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click } // trigger dragdropons on the targeted entity + RaiseLocalEvent(target.Uid, interactionArgs, false); foreach (var dragDropOn in target.GetAllComponents()) { if (dragDropOn.CanDragDropOn(interactionArgs) && @@ -408,7 +410,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click private async void InteractAfter(IEntity user, IEntity weapon, EntityCoordinates clickLocation, bool canReach) { var message = new AfterInteractMessage(user, weapon, null, clickLocation, canReach); - RaiseLocalEvent(message); + RaiseLocalEvent(weapon.Uid, message); if (message.Handled) { return; @@ -425,11 +427,9 @@ namespace Content.Server.GameObjects.EntitySystems.Click public async Task Interaction(IEntity user, IEntity weapon, IEntity attacked, EntityCoordinates clickLocation) { var attackMsg = new InteractUsingMessage(user, weapon, attacked, clickLocation); - RaiseLocalEvent(attackMsg); + RaiseLocalEvent(attacked.Uid, attackMsg); if (attackMsg.Handled) - { return; - } var attackBys = attacked.GetAllComponents().OrderByDescending(x => x.Priority); var attackByEventArgs = new InteractUsingEventArgs @@ -451,7 +451,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click } var afterAtkMsg = new AfterInteractMessage(user, weapon, attacked, clickLocation, true); - RaiseLocalEvent(afterAtkMsg); + RaiseLocalEvent(weapon.Uid, afterAtkMsg, false); if (afterAtkMsg.Handled) { return; @@ -470,18 +470,16 @@ namespace Content.Server.GameObjects.EntitySystems.Click public void Interaction(IEntity user, IEntity attacked) { var message = new AttackHandMessage(user, attacked); - RaiseLocalEvent(message); + RaiseLocalEvent(attacked.Uid, message); if (message.Handled) - { return; - } - var attackHands = attacked.GetAllComponents().ToList(); var attackHandEventArgs = new InteractHandEventArgs { User = user, Target = attacked }; // all attackHands should only fire when in range / unobstructed if (attackHandEventArgs.InRangeUnobstructed(ignoreInsideBlocker: true, popup: true)) { + var attackHands = attacked.GetAllComponents().ToList(); foreach (var attackHand in attackHands) { if (attackHand.InteractHand(attackHandEventArgs)) @@ -525,7 +523,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click } var useMsg = new UseInHandMessage(user, used); - RaiseLocalEvent(useMsg); + RaiseLocalEvent(used.Uid, useMsg); if (useMsg.Handled) { return; @@ -563,7 +561,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click public void ThrownInteraction(IEntity user, IEntity thrown) { var throwMsg = new ThrownMessage(user, thrown); - RaiseLocalEvent(throwMsg); + RaiseLocalEvent(thrown.Uid, throwMsg); if (throwMsg.Handled) { return; @@ -586,7 +584,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click public void EquippedInteraction(IEntity user, IEntity equipped, EquipmentSlotDefines.Slots slot) { var equipMsg = new EquippedMessage(user, equipped, slot); - RaiseLocalEvent(equipMsg); + RaiseLocalEvent(equipped.Uid, equipMsg); if (equipMsg.Handled) { return; @@ -608,7 +606,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click public void UnequippedInteraction(IEntity user, IEntity equipped, EquipmentSlotDefines.Slots slot) { var unequipMsg = new UnequippedMessage(user, equipped, slot); - RaiseLocalEvent(unequipMsg); + RaiseLocalEvent(equipped.Uid, unequipMsg); if (unequipMsg.Handled) { return; @@ -630,7 +628,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click public void EquippedHandInteraction(IEntity user, IEntity item, SharedHand hand) { var equippedHandMessage = new EquippedHandMessage(user, item, hand); - RaiseLocalEvent(equippedHandMessage); + RaiseLocalEvent(item.Uid, equippedHandMessage); if (equippedHandMessage.Handled) { return; @@ -651,7 +649,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click public void UnequippedHandInteraction(IEntity user, IEntity item, SharedHand hand) { var unequippedHandMessage = new UnequippedHandMessage(user, item, hand); - RaiseLocalEvent(unequippedHandMessage); + RaiseLocalEvent(item.Uid, unequippedHandMessage); if (unequippedHandMessage.Handled) { return; @@ -684,7 +682,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click public void DroppedInteraction(IEntity user, IEntity item, bool intentional) { var dropMsg = new DroppedMessage(user, item, intentional); - RaiseLocalEvent(dropMsg); + RaiseLocalEvent(item.Uid, dropMsg); if (dropMsg.Handled) { return; @@ -706,7 +704,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click public void HandSelectedInteraction(IEntity user, IEntity item) { var handSelectedMsg = new HandSelectedMessage(user, item); - RaiseLocalEvent(handSelectedMsg); + RaiseLocalEvent(item.Uid, handSelectedMsg); if (handSelectedMsg.Handled) { return; @@ -728,7 +726,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click public void HandDeselectedInteraction(IEntity user, IEntity item) { var handDeselectedMsg = new HandDeselectedMessage(user, item); - RaiseLocalEvent(handDeselectedMsg); + RaiseLocalEvent(item.Uid, handDeselectedMsg); if (handDeselectedMsg.Handled) { return; @@ -750,7 +748,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click public async void RangedInteraction(IEntity user, IEntity weapon, IEntity attacked, EntityCoordinates clickLocation) { var rangedMsg = new RangedInteractMessage(user, weapon, attacked, clickLocation); - RaiseLocalEvent(rangedMsg); + RaiseLocalEvent(attacked.Uid, rangedMsg); if (rangedMsg.Handled) return; @@ -771,7 +769,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click } var afterAtkMsg = new AfterInteractMessage(user, weapon, attacked, clickLocation, false); - RaiseLocalEvent(afterAtkMsg); + RaiseLocalEvent(weapon.Uid, afterAtkMsg); if (afterAtkMsg.Handled) return; @@ -820,6 +818,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click if (item != null) { + RaiseLocalEvent(item.Uid, eventArgs, false); foreach (var attackComponent in item.GetAllComponents()) { if (wideAttack ? attackComponent.WideAttack(eventArgs) : attackComponent.ClickAttack(eventArgs)) @@ -840,6 +839,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click } } + RaiseLocalEvent(player.Uid, eventArgs); foreach (var attackComponent in player.GetAllComponents()) { if (wideAttack) diff --git a/Content.Shared/AI/SharedAiDebug.cs b/Content.Shared/AI/SharedAiDebug.cs index a40fd76c5b..92d2d60b20 100644 --- a/Content.Shared/AI/SharedAiDebug.cs +++ b/Content.Shared/AI/SharedAiDebug.cs @@ -12,7 +12,7 @@ namespace Content.Shared.AI { #region Mob Debug [Serializable, NetSerializable] - public class UtilityAiDebugMessage : EntitySystemMessage + public class UtilityAiDebugMessage : EntityEventArgs { public EntityUid EntityUid { get; } public double PlanningTime { get; } @@ -40,10 +40,10 @@ namespace Content.Shared.AI /// Client asks the server for the pathfinding graph details /// [Serializable, NetSerializable] - public class RequestPathfindingGraphMessage : EntitySystemMessage {} + public class RequestPathfindingGraphMessage : EntityEventArgs {} [Serializable, NetSerializable] - public class PathfindingGraphMessage : EntitySystemMessage + public class PathfindingGraphMessage : EntityEventArgs { public Dictionary> Graph { get; } @@ -97,7 +97,7 @@ namespace Content.Shared.AI } [Serializable, NetSerializable] - public class AStarRouteMessage : EntitySystemMessage + public class AStarRouteMessage : EntityEventArgs { public readonly EntityUid EntityUid; public readonly IEnumerable Route; @@ -121,7 +121,7 @@ namespace Content.Shared.AI } [Serializable, NetSerializable] - public class JpsRouteMessage : EntitySystemMessage + public class JpsRouteMessage : EntityEventArgs { public readonly EntityUid EntityUid; public readonly IEnumerable Route; @@ -143,7 +143,7 @@ namespace Content.Shared.AI #endregion #region Reachable Debug [Serializable, NetSerializable] - public sealed class ReachableChunkRegionsDebugMessage : EntitySystemMessage + public sealed class ReachableChunkRegionsDebugMessage : EntityEventArgs { public GridId GridId { get; } public Dictionary>> Regions { get; } @@ -156,7 +156,7 @@ namespace Content.Shared.AI } [Serializable, NetSerializable] - public sealed class ReachableCacheDebugMessage : EntitySystemMessage + public sealed class ReachableCacheDebugMessage : EntityEventArgs { public GridId GridId { get; } public Dictionary> Regions { get; } @@ -174,13 +174,13 @@ namespace Content.Shared.AI /// Send if someone is subscribing to reachable regions for NPCs. /// [Serializable, NetSerializable] - public sealed class SubscribeReachableMessage : EntitySystemMessage {} + public sealed class SubscribeReachableMessage : EntityEventArgs {} /// /// Send if someone is unsubscribing to reachable regions for NPCs. /// [Serializable, NetSerializable] - public sealed class UnsubscribeReachableMessage : EntitySystemMessage {} + public sealed class UnsubscribeReachableMessage : EntityEventArgs {} #endregion } } diff --git a/Content.Shared/GameObjects/EntitySystemMessages/CombatModeSystemMessages.cs b/Content.Shared/GameObjects/EntitySystemMessages/CombatModeSystemMessages.cs index d36ff7add7..a7d5fb275d 100644 --- a/Content.Shared/GameObjects/EntitySystemMessages/CombatModeSystemMessages.cs +++ b/Content.Shared/GameObjects/EntitySystemMessages/CombatModeSystemMessages.cs @@ -9,7 +9,7 @@ namespace Content.Shared.GameObjects.EntitySystemMessages public static class CombatModeSystemMessages { [Serializable, NetSerializable] - public sealed class SetTargetZoneMessage : EntitySystemMessage + public sealed class SetTargetZoneMessage : EntityEventArgs { public SetTargetZoneMessage(TargetingZone targetZone) { @@ -20,7 +20,7 @@ namespace Content.Shared.GameObjects.EntitySystemMessages } [Serializable, NetSerializable] - public sealed class SetCombatModeActiveMessage : EntitySystemMessage + public sealed class SetCombatModeActiveMessage : EntityEventArgs { public SetCombatModeActiveMessage(bool active) { diff --git a/Content.Shared/GameObjects/EntitySystemMessages/DragDropMessage.cs b/Content.Shared/GameObjects/EntitySystemMessages/DragDropMessage.cs index 693a16b325..c2e7098000 100644 --- a/Content.Shared/GameObjects/EntitySystemMessages/DragDropMessage.cs +++ b/Content.Shared/GameObjects/EntitySystemMessages/DragDropMessage.cs @@ -10,7 +10,7 @@ namespace Content.Shared.GameObjects.EntitySystemMessages /// Requests a drag / drop interaction to be performed /// [Serializable, NetSerializable] - public class DragDropMessage : EntitySystemMessage + public class DragDropMessage : EntityEventArgs { public EntityCoordinates DropLocation { get; } public EntityUid Dropped { get; } diff --git a/Content.Shared/GameObjects/EntitySystemMessages/ExamineSystemMessages.cs b/Content.Shared/GameObjects/EntitySystemMessages/ExamineSystemMessages.cs index e494748897..875c0f6a7c 100644 --- a/Content.Shared/GameObjects/EntitySystemMessages/ExamineSystemMessages.cs +++ b/Content.Shared/GameObjects/EntitySystemMessages/ExamineSystemMessages.cs @@ -9,7 +9,7 @@ namespace Content.Shared.GameObjects.EntitySystemMessages public static class ExamineSystemMessages { [Serializable, NetSerializable] - public class RequestExamineInfoMessage : EntitySystemMessage + public class RequestExamineInfoMessage : EntityEventArgs { public readonly EntityUid EntityUid; @@ -20,7 +20,7 @@ namespace Content.Shared.GameObjects.EntitySystemMessages } [Serializable, NetSerializable] - public class ExamineInfoResponseMessage : EntitySystemMessage + public class ExamineInfoResponseMessage : EntityEventArgs { public readonly EntityUid EntityUid; public readonly FormattedMessage Message; diff --git a/Content.Shared/GameObjects/EntitySystemMessages/Gravity/GravityChangedMessage.cs b/Content.Shared/GameObjects/EntitySystemMessages/Gravity/GravityChangedMessage.cs index 64df4866d1..f82a0cfa65 100644 --- a/Content.Shared/GameObjects/EntitySystemMessages/Gravity/GravityChangedMessage.cs +++ b/Content.Shared/GameObjects/EntitySystemMessages/Gravity/GravityChangedMessage.cs @@ -4,7 +4,7 @@ using Robust.Shared.Map; namespace Content.Shared.GameObjects.EntitySystemMessages.Gravity { - public class GravityChangedMessage : EntitySystemMessage + public class GravityChangedMessage : EntityEventArgs { public GravityChangedMessage(IMapGrid grid) { diff --git a/Content.Shared/GameObjects/EntitySystemMessages/MeleeWeaponSystemMessages.cs b/Content.Shared/GameObjects/EntitySystemMessages/MeleeWeaponSystemMessages.cs index 840ac9bd4f..6ebba44440 100644 --- a/Content.Shared/GameObjects/EntitySystemMessages/MeleeWeaponSystemMessages.cs +++ b/Content.Shared/GameObjects/EntitySystemMessages/MeleeWeaponSystemMessages.cs @@ -10,7 +10,7 @@ namespace Content.Shared.GameObjects.EntitySystemMessages public static class MeleeWeaponSystemMessages { [Serializable, NetSerializable] - public sealed class PlayMeleeWeaponAnimationMessage : EntitySystemMessage + public sealed class PlayMeleeWeaponAnimationMessage : EntityEventArgs { public PlayMeleeWeaponAnimationMessage(string arcPrototype, Angle angle, EntityUid attacker, EntityUid source, List hits, bool textureEffect = false, bool arcFollowAttacker = true) { @@ -33,7 +33,7 @@ namespace Content.Shared.GameObjects.EntitySystemMessages } [Serializable, NetSerializable] - public sealed class PlayLungeAnimationMessage : EntitySystemMessage + public sealed class PlayLungeAnimationMessage : EntityEventArgs { public Angle Angle { get; } public EntityUid Source { get; } diff --git a/Content.Shared/GameObjects/EntitySystemMessages/PlayerContainerVisibilityMessage.cs b/Content.Shared/GameObjects/EntitySystemMessages/PlayerContainerVisibilityMessage.cs index c65ff08b3b..4816a054d5 100644 --- a/Content.Shared/GameObjects/EntitySystemMessages/PlayerContainerVisibilityMessage.cs +++ b/Content.Shared/GameObjects/EntitySystemMessages/PlayerContainerVisibilityMessage.cs @@ -6,7 +6,7 @@ using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.EntitySystemMessages { [Serializable, NetSerializable] - public class PlayerContainerVisibilityMessage : EntitySystemMessage + public class PlayerContainerVisibilityMessage : EntityEventArgs { public readonly bool CanSeeThrough; diff --git a/Content.Shared/GameObjects/EntitySystemMessages/SuspicionMessages.cs b/Content.Shared/GameObjects/EntitySystemMessages/SuspicionMessages.cs index 12af729e15..1305110395 100644 --- a/Content.Shared/GameObjects/EntitySystemMessages/SuspicionMessages.cs +++ b/Content.Shared/GameObjects/EntitySystemMessages/SuspicionMessages.cs @@ -8,7 +8,7 @@ namespace Content.Shared.GameObjects.EntitySystemMessages public static class SuspicionMessages { [Serializable, NetSerializable] - public sealed class SetSuspicionEndTimerMessage : EntitySystemMessage + public sealed class SetSuspicionEndTimerMessage : EntityEventArgs { public TimeSpan? EndTime; } diff --git a/Content.Shared/GameObjects/EntitySystemMessages/VerbSystemMessages.cs b/Content.Shared/GameObjects/EntitySystemMessages/VerbSystemMessages.cs index 031a551343..51934cc65e 100644 --- a/Content.Shared/GameObjects/EntitySystemMessages/VerbSystemMessages.cs +++ b/Content.Shared/GameObjects/EntitySystemMessages/VerbSystemMessages.cs @@ -10,7 +10,7 @@ namespace Content.Shared.GameObjects.EntitySystemMessages public static class VerbSystemMessages { [Serializable, NetSerializable] - public class RequestVerbsMessage : EntitySystemMessage + public class RequestVerbsMessage : EntityEventArgs { public readonly EntityUid EntityUid; @@ -21,7 +21,7 @@ namespace Content.Shared.GameObjects.EntitySystemMessages } [Serializable, NetSerializable] - public class VerbsResponseMessage : EntitySystemMessage + public class VerbsResponseMessage : EntityEventArgs { public readonly NetVerbData[] Verbs; public readonly EntityUid Entity; @@ -55,7 +55,7 @@ namespace Content.Shared.GameObjects.EntitySystemMessages } [Serializable, NetSerializable] - public class UseVerbMessage : EntitySystemMessage + public class UseVerbMessage : EntityEventArgs { public readonly EntityUid EntityUid; public readonly string VerbKey; diff --git a/Content.Shared/GameObjects/EntitySystems/Atmos/SharedAtmosDebugOverlaySystem.cs b/Content.Shared/GameObjects/EntitySystems/Atmos/SharedAtmosDebugOverlaySystem.cs index 72fd2e87ee..012d8b4032 100644 --- a/Content.Shared/GameObjects/EntitySystems/Atmos/SharedAtmosDebugOverlaySystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/Atmos/SharedAtmosDebugOverlaySystem.cs @@ -38,7 +38,7 @@ namespace Content.Shared.GameObjects.EntitySystems.Atmos /// No point re-sending every tile if only a subset might have been updated. /// [Serializable, NetSerializable] - public sealed class AtmosDebugOverlayMessage : EntitySystemMessage + public sealed class AtmosDebugOverlayMessage : EntityEventArgs { public GridId GridId { get; } @@ -55,7 +55,7 @@ namespace Content.Shared.GameObjects.EntitySystems.Atmos } [Serializable, NetSerializable] - public sealed class AtmosDebugOverlayDisableMessage : EntitySystemMessage + public sealed class AtmosDebugOverlayDisableMessage : EntityEventArgs { } } diff --git a/Content.Shared/GameObjects/EntitySystems/Atmos/SharedGasTileOverlaySystem.cs b/Content.Shared/GameObjects/EntitySystems/Atmos/SharedGasTileOverlaySystem.cs index 1112c5f241..e7c44303a6 100644 --- a/Content.Shared/GameObjects/EntitySystems/Atmos/SharedGasTileOverlaySystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/Atmos/SharedGasTileOverlaySystem.cs @@ -100,7 +100,7 @@ namespace Content.Shared.GameObjects.EntitySystems.Atmos /// No point re-sending every tile if only a subset might have been updated. /// [Serializable, NetSerializable] - public sealed class GasOverlayMessage : EntitySystemMessage + public sealed class GasOverlayMessage : EntityEventArgs { public GridId GridId { get; } diff --git a/Content.Shared/GameObjects/EntitySystems/SharedConstructionSystem.cs b/Content.Shared/GameObjects/EntitySystems/SharedConstructionSystem.cs index cd45b87d5a..456ab29cc8 100644 --- a/Content.Shared/GameObjects/EntitySystems/SharedConstructionSystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/SharedConstructionSystem.cs @@ -14,7 +14,7 @@ namespace Content.Shared.GameObjects.EntitySystems /// a structure-construction. /// [Serializable, NetSerializable] - public class TryStartStructureConstructionMessage : EntitySystemMessage + public class TryStartStructureConstructionMessage : EntityEventArgs { /// /// Position to start building. @@ -47,7 +47,7 @@ namespace Content.Shared.GameObjects.EntitySystems /// an item-construction. /// [Serializable, NetSerializable] - public class TryStartItemConstructionMessage : EntitySystemMessage + public class TryStartItemConstructionMessage : EntityEventArgs { /// /// The construction prototype to start building. @@ -64,7 +64,7 @@ namespace Content.Shared.GameObjects.EntitySystems /// Send server -> client to tell the client that a ghost has started to be constructed. /// [Serializable, NetSerializable] - public class AckStructureConstructionMessage : EntitySystemMessage + public class AckStructureConstructionMessage : EntityEventArgs { public readonly int GhostId; diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IActivate.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IActivate.cs index c44ee207fa..d52681b4c4 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IActivate.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IActivate.cs @@ -31,13 +31,8 @@ namespace Content.Shared.Interfaces.GameObjects.Components /// Raised when an entity is activated in the world. /// [PublicAPI] - public class ActivateInWorldMessage : EntitySystemMessage + public class ActivateInWorldMessage : HandledEntityEventArgs { - /// - /// If this message has already been "handled" by a previous system. - /// - public bool Handled { get; set; } - /// /// Entity that activated the world entity. /// diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAfterInteract.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAfterInteract.cs index b9db986601..b5fd2ea5c7 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAfterInteract.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAfterInteract.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using System; using System.Threading.Tasks; using JetBrains.Annotations; @@ -50,13 +50,8 @@ namespace Content.Shared.Interfaces.GameObjects.Components /// Raised when clicking on another object and no attack event was handled. /// [PublicAPI] - public class AfterInteractMessage : EntitySystemMessage + public class AfterInteractMessage : HandledEntityEventArgs { - /// - /// If this message has already been "handled" by a previous system. - /// - public bool Handled { get; set; } - /// /// Entity that triggered the attack. /// diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAttack.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAttack.cs index 9c2493a5de..8c60e71ad6 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAttack.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAttack.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using System; using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; @@ -18,7 +18,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components bool ClickAttack(AttackEventArgs eventArgs); } - public class AttackEventArgs : EventArgs + public class AttackEventArgs : EntityEventArgs { public AttackEventArgs(IEntity user, EntityCoordinates clickLocation, bool wideAttack, EntityUid target = default) { diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDraggable.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDraggable.cs index 58145bd934..450c8b7903 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDraggable.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDraggable.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using System; using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; @@ -58,7 +58,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components } } - public class StartDragDropEventArgs : EventArgs + public class StartDragDropEventArgs : EntityEventArgs { /// /// Creates a new instance of . diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDropped.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDropped.cs index 1fd2e0d5b2..2f527ba032 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDropped.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDropped.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using System; using JetBrains.Annotations; using Robust.Shared.Analyzers; @@ -32,13 +32,8 @@ namespace Content.Shared.Interfaces.GameObjects.Components /// Raised when an entity is dropped /// [PublicAPI] - public class DroppedMessage : EntitySystemMessage + public class DroppedMessage : HandledEntityEventArgs { - /// - /// If this message has already been "handled" by a previous system. - /// - public bool Handled { get; set; } - /// /// Entity that dropped the item. /// diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquipped.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquipped.cs index 7a6bac3d2f..a050b90659 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquipped.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquipped.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using System; using Content.Shared.GameObjects.Components.Inventory; using JetBrains.Annotations; @@ -45,13 +45,8 @@ namespace Content.Shared.Interfaces.GameObjects.Components /// Raised when equipping the entity in an inventory slot. /// [PublicAPI] - public class EquippedMessage : EntitySystemMessage + public class EquippedMessage : HandledEntityEventArgs { - /// - /// If this message has already been "handled" by a previous system. - /// - public bool Handled { get; set; } - /// /// Entity that equipped the item. /// diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquippedHand.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquippedHand.cs index 0f668f7542..4d42c4ba77 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquippedHand.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquippedHand.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using Content.Shared.GameObjects.Components.Items; using JetBrains.Annotations; using Robust.Shared.Analyzers; @@ -32,13 +32,8 @@ namespace Content.Shared.Interfaces.GameObjects.Components /// Raised when putting the entity into a hand slot /// [PublicAPI] - public class EquippedHandMessage : EntitySystemMessage + public class EquippedHandMessage : HandledEntityEventArgs { - /// - /// If this message has already been "handled" by a previous system. - /// - public bool Handled { get; set; } - /// /// Entity that equipped the item. /// diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandDeselected.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandDeselected.cs index 3e36aa503b..39fb21b8d9 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandDeselected.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandDeselected.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using System; using JetBrains.Annotations; using Robust.Shared.Analyzers; @@ -29,13 +29,8 @@ namespace Content.Shared.Interfaces.GameObjects.Components /// Raised when an entity item in a hand is deselected. /// [PublicAPI] - public class HandDeselectedMessage : EntitySystemMessage + public class HandDeselectedMessage : HandledEntityEventArgs { - /// - /// If this message has already been "handled" by a previous system. - /// - public bool Handled { get; set; } - /// /// Entity that owns the deselected hand. /// diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandSelected.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandSelected.cs index fb966b4936..d4d833699f 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandSelected.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandSelected.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using System; using JetBrains.Annotations; using Robust.Shared.Analyzers; @@ -29,13 +29,8 @@ namespace Content.Shared.Interfaces.GameObjects.Components /// Raised when an entity item in a hand is selected. /// [PublicAPI] - public class HandSelectedMessage : EntitySystemMessage + public class HandSelectedMessage : HandledEntityEventArgs { - /// - /// If this message has already been "handled" by a previous system. - /// - public bool Handled { get; set; } - /// /// Entity that owns the selected hand. /// diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractHand.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractHand.cs index c787beb553..f617ecf509 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractHand.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractHand.cs @@ -29,13 +29,8 @@ namespace Content.Shared.Interfaces.GameObjects.Components /// Raised when being clicked on or "attacked" by a user with an empty hand. /// [PublicAPI] - public class AttackHandMessage : EntitySystemMessage + public class AttackHandMessage : HandledEntityEventArgs { - /// - /// If this message has already been "handled" by a previous system. - /// - public bool Handled { get; set; } - /// /// Entity that triggered the attack. /// diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs index 06c8b20e6f..dec7cf2c94 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs @@ -39,13 +39,8 @@ namespace Content.Shared.Interfaces.GameObjects.Components /// Raised when being clicked on or "attacked" by a user with an object in their hand /// [PublicAPI] - public class InteractUsingMessage : EntitySystemMessage + public class InteractUsingMessage : HandledEntityEventArgs { - /// - /// If this message has already been "handled" by a previous system. - /// - public bool Handled { get; set; } - /// /// Entity that triggered the attack. /// diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/ILand.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/ILand.cs index a296d58195..b588f3af5c 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/ILand.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/ILand.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using System; using JetBrains.Annotations; using Robust.Shared.Analyzers; @@ -32,13 +32,8 @@ namespace Content.Shared.Interfaces.GameObjects.Components /// Raised when an entity that was thrown lands. /// [PublicAPI] - public class LandMessage : EntitySystemMessage + public class LandMessage : HandledEntityEventArgs { - /// - /// If this message has already been "handled" by a previous system. - /// - public bool Handled { get; set; } - /// /// Entity that threw the item. /// diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRangedInteract.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRangedInteract.cs index 3fc46a2713..e22aae8cbc 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRangedInteract.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRangedInteract.cs @@ -1,4 +1,4 @@ -using System; +using System; using JetBrains.Annotations; using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; @@ -32,13 +32,8 @@ namespace Content.Shared.Interfaces.GameObjects.Components /// Raised when being clicked by objects outside the range of direct use. /// [PublicAPI] - public class RangedInteractMessage : EntitySystemMessage + public class RangedInteractMessage : HandledEntityEventArgs { - /// - /// If this message has already been "handled" by a previous system. - /// - public bool Handled { get; set; } - /// /// Entity that triggered the attack. /// diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrowCollide.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrowCollide.cs index da811afe2d..d7340260e6 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrowCollide.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrowCollide.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using System; using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; @@ -38,13 +38,8 @@ namespace Content.Shared.Interfaces.GameObjects.Components } } - public class ThrowCollideMessage : EntitySystemMessage + public class ThrowCollideMessage : HandledEntityEventArgs { - /// - /// If this message has already been "handled" by a previous system. - /// - public bool Handled { get; set; } - /// /// The entity that threw . /// diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrown.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrown.cs index d0f76d572d..db4812420f 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrown.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrown.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using System; using JetBrains.Annotations; using Robust.Shared.Analyzers; @@ -29,13 +29,8 @@ namespace Content.Shared.Interfaces.GameObjects.Components /// Raised when throwing the entity in your hands. /// [PublicAPI] - public class ThrownMessage : EntitySystemMessage + public class ThrownMessage : HandledEntityEventArgs { - /// - /// If this message has already been "handled" by a previous system. - /// - public bool Handled { get; set; } - /// /// Entity that threw the item. /// diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequipped.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequipped.cs index 41fca20ea3..cbde9c578e 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequipped.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequipped.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using Content.Shared.GameObjects.Components.Inventory; using JetBrains.Annotations; using Robust.Shared.Analyzers; @@ -34,13 +34,8 @@ namespace Content.Shared.Interfaces.GameObjects.Components /// Raised when removing the entity from an inventory slot. /// [PublicAPI] - public class UnequippedMessage : EntitySystemMessage + public class UnequippedMessage : HandledEntityEventArgs { - /// - /// If this message has already been "handled" by a previous system. - /// - public bool Handled { get; set; } - /// /// Entity that equipped the item. /// diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequippedHand.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequippedHand.cs index 8a3ba843f1..3a62406af9 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequippedHand.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequippedHand.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using Content.Shared.GameObjects.Components.Items; using JetBrains.Annotations; using Robust.Shared.Analyzers; @@ -31,13 +31,8 @@ namespace Content.Shared.Interfaces.GameObjects.Components /// Raised when removing the entity from an inventory slot. /// [PublicAPI] - public class UnequippedHandMessage : EntitySystemMessage + public class UnequippedHandMessage : HandledEntityEventArgs { - /// - /// If this message has already been "handled" by a previous system. - /// - public bool Handled { get; set; } - /// /// Entity that equipped the item. /// diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUse.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUse.cs index 9c23da73fe..d42f0098c0 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUse.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUse.cs @@ -1,4 +1,4 @@ -using System; +using System; using JetBrains.Annotations; using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; @@ -28,13 +28,8 @@ namespace Content.Shared.Interfaces.GameObjects.Components /// Raised when using the entity in your hands. /// [PublicAPI] - public class UseInHandMessage : EntitySystemMessage + public class UseInHandMessage : HandledEntityEventArgs { - /// - /// If this message has already been "handled" by a previous system. - /// - public bool Handled { get; set; } - /// /// Entity holding the item in their hand. /// diff --git a/RobustToolbox b/RobustToolbox index a0d241e551..f7e8178736 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit a0d241e551404cec586df5a7e1fe9ef3b5ec3eeb +Subproject commit f7e8178736f1a9ce304ffbf78b0ba2e764b34a6d