diff --git a/Content.Server/Vehicle/VehicleSystem.cs b/Content.Server/Vehicle/VehicleSystem.cs index fe2cabb951..cffacd21d3 100644 --- a/Content.Server/Vehicle/VehicleSystem.cs +++ b/Content.Server/Vehicle/VehicleSystem.cs @@ -12,6 +12,8 @@ using Content.Shared.Tag; using Content.Shared.Movement.Systems; using Robust.Shared.Audio; using Robust.Shared.Containers; +using Robust.Shared.Physics; +using Robust.Shared.Physics.Systems; using Robust.Shared.Player; using DrawDepth = Content.Shared.DrawDepth.DrawDepth; @@ -20,10 +22,10 @@ namespace Content.Server.Vehicle public sealed partial class VehicleSystem : SharedVehicleSystem { [Dependency] private readonly HandVirtualItemSystem _virtualItemSystem = default!; - [Dependency] private readonly MetaDataSystem _metadata = default!; [Dependency] private readonly MovementSpeedModifierSystem _modifier = default!; [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; [Dependency] private readonly SharedAmbientSoundSystem _ambientSound = default!; + [Dependency] private readonly SharedJointSystem _joints = default!; [Dependency] private readonly SharedMoverController _mover = default!; [Dependency] private readonly TagSystem _tagSystem = default!; @@ -112,6 +114,11 @@ namespace Content.Server.Vehicle _actionsSystem.AddAction(args.BuckledEntity, component.HornAction, uid, actions); } + if (TryComp(args.BuckledEntity, out var joints)) + { + _joints.ClearJoints(joints); + } + return; }