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

Remove IRelayMoveInput (#4663)

Browse Source 
* Remove IRelayMoveInput

This interface gets called every time a movement key is pressed so it gets called a lot.

* Remove RelayMovementEntityMessage

Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
This commit is contained in:
metalgearsloth
2021-09-20 19:06:48 +10:00
committed by GitHub
parent fcc1217e5d
commit 578ed16b8f
16 changed files with 179 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Content.Shared/Movement/EntitySystems/SharedMoverSystem.cs
View File

@@ -41,7 +41,7 @@ namespace Content.Shared.Movement.EntitySystems
base.Shutdown();
}
private static void HandleDirChange(ICommonSession? session, Direction dir, ushort subTick, bool state)
private void HandleDirChange(ICommonSession? session, Direction dir, ushort subTick, bool state)
{
if (!TryGetAttachedComponent<IMoverComponent>(session, out var moverComp))
return;
@@ -50,19 +50,13 @@ namespace Content.Shared.Movement.EntitySystems
if (owner != null && session != null)
{
foreach (var comp in owner.GetAllComponents<IRelayMoveInput>().ToArray())
{
comp.MoveInputPressed(session);
}
EntityManager.EventBus.RaiseLocalEvent(owner.Uid, new RelayMoveInputEvent(session));
// For stuff like "Moving out of locker" or the likes
if (owner.IsInContainer() &&
(!owner.TryGetComponent(out IMobStateComponent? mobState) ||
mobState.IsAlive()))
{
var relayEntityMoveMessage = new RelayMovementEntityMessage(owner);
owner.Transform.Parent!.Owner.SendMessage(owner.Transform, relayEntityMoveMessage);
var relayMoveEvent = new RelayMovementEntityEvent(owner);
owner.EntityManager.EventBus.RaiseLocalEvent(owner.Transform.ParentUid, relayMoveEvent);
}
@@ -114,7 +108,7 @@ namespace Content.Shared.Movement.EntitySystems
return false;
}
HandleDirChange(session, _dir, message.SubTick, full.State == BoundKeyState.Down);
Get<SharedMoverSystem>().HandleDirChange(session, _dir, message.SubTick, full.State == BoundKeyState.Down);
return false;
}
}
@@ -133,4 +127,14 @@ namespace Content.Shared.Movement.EntitySystems
}
}
}
public sealed class RelayMoveInputEvent : EntityEventArgs
{
public ICommonSession Session { get; }
public RelayMoveInputEvent(ICommonSession session)
{
Session = session;
}
}
}