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

Fix map renderer (#21515)

Browse Source
This commit is contained in:
DrSmugleaf
2023-11-07 14:27:01 -08:00
committed by GitHub
parent 778d3e9847
commit 651dffba16
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.MapRenderer/Painters/MapPainter.cs
View File

@@ -1,4 +1,3 @@
#nullable enable
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@@ -15,7 +14,6 @@ using Robust.Shared.Timing;
using SixLabors.ImageSharp; using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.PixelFormats;
using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing;
using SpriteComponent = Robust.Client.GameObjects.SpriteComponent;
namespace Content.MapRenderer.Painters namespace Content.MapRenderer.Painters
{ {
@@ -46,7 +44,7 @@ namespace Content.MapRenderer.Painters
await client.WaitPost(() => await client.WaitPost(() =>
{ {
if (cEntityManager.TryGetComponent(cPlayerManager.LocalPlayer!.ControlledEntity!, out SpriteComponent? sprite)) if (cEntityManager.TryGetComponent(cPlayerManager.LocalEntity, out SpriteComponent? sprite))
{ {
sprite.Visible = false; sprite.Visible = false;
} }
@@ -62,7 +60,7 @@ namespace Content.MapRenderer.Painters
var tilePainter = new TilePainter(client, server); var tilePainter = new TilePainter(client, server);
var entityPainter = new GridPainter(client, server); var entityPainter = new GridPainter(client, server);
(EntityUid Uid, MapGridComponent Grid)[] grids = null!; Entity<MapGridComponent>[] grids = null!;
var xformQuery = sEntityManager.GetEntityQuery<TransformComponent>(); var xformQuery = sEntityManager.GetEntityQuery<TransformComponent>();
var xformSystem = sEntityManager.System<SharedTransformSystem>(); var xformSystem = sEntityManager.System<SharedTransformSystem>();
@@ -76,7 +74,7 @@ namespace Content.MapRenderer.Painters
} }
var mapId = sMapManager.GetAllMapIds().Last(); 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) foreach (var (uid, _) in grids)
{ {