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

Fix 0-length climbs (#21224)

Browse Source
This commit is contained in:
metalgearsloth
2023-10-24 21:44:09 +11:00
committed by GitHub
parent ea0459fe6c
commit 4701b853ef
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Content.Shared/Climbing/Systems/ClimbSystem.cs
View File

@@ -257,15 +257,25 @@ public sealed partial class ClimbSystem : VirtualController
// Need direction relative to climber's parent. // Need direction relative to climber's parent.
var localDirection = (-parentRot).RotateVec(worldDirection); var localDirection = (-parentRot).RotateVec(worldDirection);
climbing.IsClimbing = true; // On top of it already so just do it in place.
var climbDuration = TimeSpan.FromSeconds(distance / climbing.TransitionRate); if (localDirection.LengthSquared() < 0.01f)
climbing.NextTransition = _timing.CurTime + climbDuration; {
climbing.NextTransition = null;
}
// VirtualController over to the thing.
else
{
var climbDuration = TimeSpan.FromSeconds(distance / climbing.TransitionRate);
climbing.NextTransition = _timing.CurTime + climbDuration;
climbing.Direction = localDirection.Normalized() * climbing.TransitionRate; climbing.Direction = localDirection.Normalized() * climbing.TransitionRate;
_actionBlockerSystem.UpdateCanMove(uid);
}
climbing.IsClimbing = true;
Dirty(uid, climbing); Dirty(uid, climbing);
_audio.PlayPredicted(comp.FinishClimbSound, climbable, user); _audio.PlayPredicted(comp.FinishClimbSound, climbable, user);
_actionBlockerSystem.UpdateCanMove(uid);
var startEv = new StartClimbEvent(climbable); var startEv = new StartClimbEvent(climbable);
var climbedEv = new ClimbedOnEvent(uid, user); var climbedEv = new ClimbedOnEvent(uid, user);