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

Remove transform methods from mapgrid (#12233)

Browse Source
This commit is contained in:
metalgearsloth
2022-11-01 11:27:18 +11:00
committed by GitHub
parent 297686c4ff
commit c9a2ab1cee
25 changed files with 144 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Objectives/Conditions/EscapeShuttleCondition.cs
View File

@@ -32,10 +32,13 @@ namespace Content.Server.Objectives.Conditions
var entMan = IoCManager.Resolve<IEntityManager>();
if (!entMan.TryGetComponent<IMapGridComponent>(shuttle, out var shuttleGrid))
if (!entMan.TryGetComponent<IMapGridComponent>(shuttle, out var shuttleGrid) ||
!entMan.TryGetComponent<TransformComponent>(shuttle, out var shuttleXform))
{
return false;
}
return shuttleGrid.Grid.WorldAABB.Contains(agentXform.WorldPosition);
return shuttleXform.WorldMatrix.TransformBox(shuttleGrid.Grid.LocalAABB).Contains(agentXform.WorldPosition);
}
public float Progress