Fix warnings and code cleanup/fixes (#13570)
This commit is contained in:
@@ -95,7 +95,7 @@ namespace Content.Shared.Interaction
|
||||
if (suid != null)
|
||||
{
|
||||
// We're buckled to another object. Is that object rotatable?
|
||||
if (TryComp<RotatableComponent>(suid.Value!, out var rotatable) && rotatable.RotateWhileAnchored)
|
||||
if (TryComp<RotatableComponent>(suid.Value, out var rotatable) && rotatable.RotateWhileAnchored)
|
||||
{
|
||||
// Note the assumption that even if unanchored, user can only do spinnychair with an "independent wheel".
|
||||
// (Since the user being buckled to it holds it down with their weight.)
|
||||
|
||||
@@ -532,9 +532,9 @@ namespace Content.Shared.Interaction
|
||||
TryComp<TransformComponent>(origin, out var xformA))
|
||||
{
|
||||
var (worldPosA, worldRotA) = xformA.GetWorldPositionRotation();
|
||||
var xfA = new Robust.Shared.Physics.Transform(worldPosA, worldRotA);
|
||||
var xfA = new Transform(worldPosA, worldRotA);
|
||||
var parentRotB = _transform.GetWorldRotation(otherCoordinates.EntityId);
|
||||
var xfB = new Robust.Shared.Physics.Transform(targetPos.Position, parentRotB + otherAngle);
|
||||
var xfB = new Transform(targetPos.Position, parentRotB + otherAngle);
|
||||
|
||||
// Different map or the likes.
|
||||
if (!_sharedBroadphaseSystem.TryGetNearest(origin, other,
|
||||
|
||||
Reference in New Issue
Block a user