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

Replace GridEntityId with Owner (#12743)

Browse Source
This commit is contained in:
metalgearsloth
2022-12-12 14:59:02 +11:00
committed by GitHub
parent 4cbf78646a
commit 3b3963083b
75 changed files with 190 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Salvage/SalvageRulerCommand.cs
View File

@@ -50,7 +50,7 @@ sealed class SalvageRulerCommand : IConsoleCommand
var first = true;
foreach (var mapGrid in _maps.GetAllMapGrids(entityTransform.MapID))
{
var aabb = _entities.GetComponent<TransformComponent>(mapGrid.GridEntityId).WorldMatrix.TransformBox(mapGrid.LocalAABB);
var aabb = _entities.GetComponent<TransformComponent>(mapGrid.Owner).WorldMatrix.TransformBox(mapGrid.LocalAABB);
if (first)
{
total = aabb;

2
Content.Server/Salvage/SalvageSystem.cs
View File

@@ -263,7 +263,7 @@ namespace Content.Server.Salvage
var tsc = Transform(component.Owner);
coords = new EntityCoordinates(component.Owner, component.Offset).ToMap(EntityManager);
if (_mapManager.TryGetGrid(tsc.GridUid, out var magnetGrid) && TryComp<TransformComponent>(magnetGrid.GridEntityId, out var gridXform))
if (_mapManager.TryGetGrid(tsc.GridUid, out var magnetGrid) && TryComp<TransformComponent>(magnetGrid.Owner, out var gridXform))
{
angle = gridXform.WorldRotation;
}