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

Fix barstool rotation (#5134)

Browse Source
This commit is contained in:
20kdc
2021-11-02 18:38:47 +00:00
committed by GitHub
parent b86fd5f57d
commit 7ced7b67c7
4 changed files with 83 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Server/Pointing/EntitySystems/PointingSystem.cs
View File

@@ -6,6 +6,7 @@ using Content.Server.Pointing.Components;
using Content.Server.Visible;
using Content.Shared.ActionBlocker;
using Content.Shared.Input;
using Content.Shared.Interaction;
using Content.Shared.Interaction.Helpers;
using Content.Shared.Popups;
using Content.Shared.Verbs;
@@ -32,6 +33,7 @@ namespace Content.Server.Pointing.EntitySystems
[Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
[Dependency] private readonly RotateToFaceSystem _rotateToFaceSystem = default!;
private static readonly TimeSpan PointDelay = TimeSpan.FromSeconds(0.5f);
@@ -114,14 +116,7 @@ namespace Content.Server.Pointing.EntitySystems
return false;
}
if (_actionBlockerSystem.CanChangeDirection(player))
{
var diff = mapCoords.Position - player.Transform.MapPosition.Position;
if (diff.LengthSquared > 0.01f)
{
player.Transform.WorldRotation = Angle.FromWorldVec(diff);
}
}
_rotateToFaceSystem.TryFaceCoordinates(player, mapCoords.Position);
var arrow = EntityManager.SpawnEntity("pointingarrow", mapCoords);