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

Misc content xform changes (#12166)

Browse Source
This commit is contained in:
Leon Friedrich
2022-10-24 20:19:51 +13:00
committed by GitHub
parent 79bd07009a
commit 0b8622e9e7
3 changed files with 4 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Coordinates/Helpers/SnapgridHelper.cs
View File

@@ -4,13 +4,6 @@ namespace Content.Server.Coordinates.Helpers
{ {
public static class SnapgridHelper public static class SnapgridHelper
{ {
public static void SnapToGrid(this EntityUid entity, IEntityManager? entMan = null, IMapManager? mapManager = null)
{
IoCManager.Resolve(ref entMan, ref mapManager);
var transform = entMan.GetComponent<TransformComponent>(entity);
transform.Coordinates = transform.Coordinates.SnapToGrid(entMan, mapManager);
}
public static EntityCoordinates SnapToGrid(this EntityCoordinates coordinates, IEntityManager? entMan = null, IMapManager? mapManager = null) public static EntityCoordinates SnapToGrid(this EntityCoordinates coordinates, IEntityManager? entMan = null, IMapManager? mapManager = null)
{ {
IoCManager.Resolve(ref entMan, ref mapManager); IoCManager.Resolve(ref entMan, ref mapManager);

6
Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs
View File

@@ -243,8 +243,10 @@ public sealed partial class PathfindingSystem
return; return;
} }
var oldGridUid = ev.OldPosition.GetGridUid(EntityManager); var gridUid = ev.Component.GridUid;
var gridUid = ev.NewPosition.GetGridUid(EntityManager); var oldGridUid = ev.OldPosition.EntityId == ev.NewPosition.EntityId
? gridUid
: ev.OldPosition.GetGridUid(EntityManager);
// Not on a grid at all so just ignore. // Not on a grid at all so just ignore.
if (oldGridUid == gridUid && oldGridUid == null) if (oldGridUid == gridUid && oldGridUid == null)

23
Content.Shared/Transform/TransformExtensions.cs
View File

@@ -1,23 +0,0 @@
namespace Content.Shared.Transform
{
public static class TransformExtensions
{
public static void AttachToGrandparent(this TransformComponent transform)
{
var grandParent = transform.Parent?.Parent;
if (grandParent == null)
{
transform.AttachToGridOrMap();
return;
}
transform.AttachParent(grandParent);
}
public static void AttachToGrandparent(this EntityUid entity)
{
AttachToGrandparent(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity));
}
}
}