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

Fixed rotation check for pulling (#8845)

Browse Source 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
keronshb
2022-06-16 05:15:56 -04:00
committed by GitHub
parent 96741fbfc0
commit bb4318b6f1
20 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Shared/Pulling/Systems/SharedPullingSystem.Actions.cs
View File

@@ -85,6 +85,13 @@ namespace Content.Shared.Pulling
if (msg.Cancelled) return false;
// Stop pulling confirmed!
if (TryComp<PhysicsComponent>(pullable.Owner, out var pullablePhysics))
{
pullablePhysics.FixedRotation = pullable.PrevFixedRotation;
}
_pullSm.ForceRelationship(null, pullable);
return true;
}
@@ -172,11 +179,11 @@ namespace Content.Shared.Pulling
RaiseLocalEvent(pullable.Owner, pullAttempt);
if (pullAttempt.Cancelled)
{
return false;
}
_pullSm.ForceRelationship(puller, pullable);
pullable.PrevFixedRotation = pullablePhysics.FixedRotation;
pullablePhysics.FixedRotation = pullable.FixedRotationOnPull;
return true;
}