space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make EyeManager resilient to invalid grid IDs

Browse Source
This commit is contained in:
Pieter-Jan Briers
2018-11-22 00:51:47 +01:00
parent 8320339ab0
commit 5c977b6f07
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SS14.Client/Graphics/ClientEye/EyeManager.cs
View File

@@ -98,7 +98,15 @@ namespace SS14.Client.Graphics.ClientEye
{
var matrix = Matrix3.Invert(MatrixViewPortTransform(sceneTree));
var worldPos = matrix.Transform(point) / PIXELSPERMETER * new Vector2(1, -1);
var grid = _mapManager.GetMap(currentEye.MapId).FindGridAt(worldPos);
IMapGrid grid ;
if (_mapManager.TryGetMap(currentEye.MapId, out var map))
{
grid = map.FindGridAt(worldPos);
}
else
{
grid = _mapManager.GetGrid(GridId.Nullspace);
}
return new GridLocalCoordinates(grid.WorldToLocal(worldPos), grid);
}