From 651dffba16e5cb7896dfd02011f0ce0b54e76e6a Mon Sep 17 00:00:00 2001 From: DrSmugleaf Date: Tue, 7 Nov 2023 14:27:01 -0800 Subject: [PATCH] Fix map renderer (#21515) --- Content.MapRenderer/Painters/MapPainter.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Content.MapRenderer/Painters/MapPainter.cs b/Content.MapRenderer/Painters/MapPainter.cs index 8f3dd59baf..8a87a93744 100644 --- a/Content.MapRenderer/Painters/MapPainter.cs +++ b/Content.MapRenderer/Painters/MapPainter.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Linq; @@ -15,7 +14,6 @@ using Robust.Shared.Timing; using SixLabors.ImageSharp; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing; -using SpriteComponent = Robust.Client.GameObjects.SpriteComponent; namespace Content.MapRenderer.Painters { @@ -46,7 +44,7 @@ namespace Content.MapRenderer.Painters await client.WaitPost(() => { - if (cEntityManager.TryGetComponent(cPlayerManager.LocalPlayer!.ControlledEntity!, out SpriteComponent? sprite)) + if (cEntityManager.TryGetComponent(cPlayerManager.LocalEntity, out SpriteComponent? sprite)) { sprite.Visible = false; } @@ -62,7 +60,7 @@ namespace Content.MapRenderer.Painters var tilePainter = new TilePainter(client, server); var entityPainter = new GridPainter(client, server); - (EntityUid Uid, MapGridComponent Grid)[] grids = null!; + Entity[] grids = null!; var xformQuery = sEntityManager.GetEntityQuery(); var xformSystem = sEntityManager.System(); @@ -76,7 +74,7 @@ namespace Content.MapRenderer.Painters } var mapId = sMapManager.GetAllMapIds().Last(); - grids = sMapManager.GetAllMapGrids(mapId).Select(o => (o.Owner, o)).ToArray(); + grids = sMapManager.GetAllGrids(mapId).ToArray(); foreach (var (uid, _) in grids) {