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

Fix for climb jank (#1803)

Browse Source 
Player body was going to sleep, so now we spam WakeBody() at it.
This commit is contained in:
nuke
2020-08-19 20:21:15 -04:00
committed by GitHub
parent 45380c129b
commit 322e38b173
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/GameObjects/Components/Movement/ClimbingComponent.cs
View File

@@ -1,15 +1,8 @@
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.GameObjects.Components;
using Content.Shared.Physics; using Content.Shared.Physics;
using Content.Shared.Maps;
using Robust.Shared.IoC;
using Robust.Shared.Interfaces.GameObjects;
using Content.Shared.GameObjects.Components.Movement; using Content.Shared.GameObjects.Components.Movement;
using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems;
using System.Collections.Generic;
using Robust.Shared.Physics;
using System.Diagnostics;
namespace Content.Server.GameObjects.Components.Movement namespace Content.Server.GameObjects.Components.Movement
{ {
@@ -61,6 +54,11 @@ namespace Content.Server.GameObjects.Components.Movement
} }
} }
if (IsClimbing)
{
Body.WakeBody();
}
if (!IsOnClimbableThisFrame && IsClimbing && _climbController == null) if (!IsOnClimbableThisFrame && IsClimbing && _climbController == null)
{ {
IsClimbing = false; IsClimbing = false;

4
Content.Shared/Physics/ClimbController.cs
View File

@@ -50,6 +50,8 @@ namespace Content.Shared.Physics
return; return;
} }
ControlledComponent.WakeBody();
if ((ControlledComponent.Owner.Transform.WorldPosition - _lastKnownPosition).Length <= 0.05f) if ((ControlledComponent.Owner.Transform.WorldPosition - _lastKnownPosition).Length <= 0.05f)
{ {
_numTicksBlocked++; _numTicksBlocked++;
@@ -61,7 +63,7 @@ namespace Content.Shared.Physics
_lastKnownPosition = ControlledComponent.Owner.Transform.WorldPosition; _lastKnownPosition = ControlledComponent.Owner.Transform.WorldPosition;
if ((ControlledComponent.Owner.Transform.WorldPosition - _movingTo.Value).Length <= 0.05f) if ((ControlledComponent.Owner.Transform.WorldPosition - _movingTo.Value).Length <= 0.1f)
{ {
_movingTo = null; _movingTo = null;
} }