tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EntitySystemMessage Removal & InteractionSystem directed events (#3572)

Browse Source 
* Removed obsolete EntitySystemMessage, now everything uses the base EntityEventArgs or the derived HandledEntityEventArgs.
Setup InteractionSystem to use new directed events.

* Update Submodule.
This commit is contained in:
Acruid
2021-03-09 11:22:48 -08:00
committed by GitHub
parent 549d84174c
commit 6edc416afc
47 changed files with 110 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/GameObjects/Components/Access/AccessReaderChangeMessage.cs
View File

@@ -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; }

11
Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs
View File

@@ -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
/// </summary>
[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)

2
Content.Server/GameObjects/Components/GUI/HandsComponent.cs
View File

@@ -839,7 +839,7 @@ namespace Content.Server.GameObjects.Components.GUI
}
}
public class HandCountChangedEvent : EntitySystemMessage
public class HandCountChangedEvent : EntityEventArgs
{
public HandCountChangedEvent(IEntity sender)
{

4
Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs
View File

@@ -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; }

2
Content.Server/GameObjects/Components/Observer/GhostComponent.cs
View File

@@ -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)
{

2
Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/EmergencyLightComponent.cs
View File

@@ -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; }