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

Mobmover tweaks (#15942)

Browse Source
This commit is contained in:
metalgearsloth
2023-05-01 18:29:35 +10:00
committed by GitHub
parent d5b3585c09
commit ec9d31d9ab
5 changed files with 151 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Content.Server/Physics/Controllers/MoverController.cs
View File

@@ -3,6 +3,7 @@ using Content.Server.Shuttles.Components;
using Content.Server.Shuttles.Systems;
using Content.Shared.Movement.Components;
using Content.Shared.Movement.Systems;
using Content.Shared.Pulling.Components;
using Content.Shared.Shuttles.Components;
using Content.Shared.Shuttles.Systems;
using Robust.Server.GameObjects;
@@ -65,11 +66,14 @@ namespace Content.Server.Physics.Controllers
var relayTargetQuery = GetEntityQuery<MovementRelayTargetComponent>();
var xformQuery = GetEntityQuery<TransformComponent>();
var moverQuery = GetEntityQuery<InputMoverComponent>();
var mobMoverQuery = GetEntityQuery<MobMoverComponent>();
var pullableQuery = GetEntityQuery<SharedPullableComponent>();
var inputQueryEnumerator = AllEntityQuery<InputMoverComponent>();
var modifierQuery = GetEntityQuery<MovementSpeedModifierComponent>();
foreach (var mover in EntityQuery<InputMoverComponent>(true))
while (inputQueryEnumerator.MoveNext(out var uid, out var mover))
{
var uid = mover.Owner;
EntityUid physicsUid = uid;
var physicsUid = uid;
if (relayQuery.HasComponent(uid))
continue;
@@ -97,7 +101,18 @@ namespace Content.Server.Physics.Controllers
continue;
}
HandleMobMovement(uid, mover, physicsUid, body, xformMover, frameTime, xformQuery, moverQuery, relayTargetQuery);
HandleMobMovement(uid,
mover,
physicsUid,
body,
xformMover,
frameTime,
xformQuery,
moverQuery,
mobMoverQuery,
relayTargetQuery,
pullableQuery,
modifierQuery);
}
HandleShuttleMovement(frameTime);