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

Fix jetpack assert (#14752)

Browse Source
This commit is contained in:
metalgearsloth
2023-03-22 15:58:53 +11:00
committed by GitHub
parent 4151b31b31
commit 5823e47442
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Client/Physics/Controllers/MoverController.cs
View File

@@ -75,8 +75,9 @@ namespace Content.Client.Physics.Controllers
return;
}
var physicsUid = player;
PhysicsComponent? body;
TransformComponent? xformMover = xform;
var xformMover = xform;
if (mover.ToParent && HasComp<RelayInputMoverComponent>(xform.ParentUid))
{
@@ -85,6 +86,8 @@ namespace Content.Client.Physics.Controllers
{
return;
}
physicsUid = xform.ParentUid;
}
else if (!TryComp(player, out body))
{
@@ -128,7 +131,7 @@ namespace Content.Client.Physics.Controllers
}
// Server-side should just be handled on its own so we'll just do this shizznit
HandleMobMovement(player, mover, body, xformMover, frameTime, xformQuery, moverQuery, relayTargetQuery);
HandleMobMovement(player, mover, physicsUid, body, xformMover, frameTime, xformQuery, moverQuery, relayTargetQuery);
}
protected override bool CanSound()