Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix a bunch of mover bugs (#9999)

Browse Source 
* Fix a bunch of mover bugs

Just regressions from random things

* Fix vehicle movement I guess
This commit is contained in:
metalgearsloth
2022-07-25 14:16:24 +10:00
committed by GitHub
parent ed068b166f
commit dad26db137
4 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Shared/Movement/Systems/SharedJetpackSystem.cs
View File

@@ -114,7 +114,8 @@ public abstract class SharedJetpackSystem : EntitySystem
private void OnJetpackToggle(EntityUid uid, JetpackComponent component, ToggleJetpackEvent args)
{
if (args.Handled) return;
if (args.Handled)
return;
if (TryComp<TransformComponent>(uid, out var xform) && !CanEnableOnGrid(xform.GridUid))
{
@@ -130,8 +131,7 @@ public abstract class SharedJetpackSystem : EntitySystem
private bool CanEnableOnGrid(EntityUid? gridUid)
{
return gridUid == null ||
(TryComp<GravityComponent>(gridUid, out var gravity) &&
!gravity.Enabled);
(!HasComp<GravityComponent>(gridUid));
}
private void OnJetpackGetAction(EntityUid uid, JetpackComponent component, GetItemActionsEvent args)

3
Content.Shared/Movement/Systems/SharedMoverController.cs
View File

@@ -114,7 +114,8 @@ namespace Content.Shared.Movement.Systems
}
UsedMobMovement[mover.Owner] = true;
var weightless = _gravity.IsWeightless(mover.Owner, physicsComponent, xform);
// Specifically don't use mover.Owner because that may be different to the actual physics body being moved.
var weightless = _gravity.IsWeightless(physicsComponent.Owner, physicsComponent, xform);
var (walkDir, sprintDir) = GetVelocityInput(mover);
var touching = false;