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

Fix MapPainter (#22290)

Browse Source
This commit is contained in:
metalgearsloth
2023-12-10 22:19:26 +11:00
committed by GitHub
parent 4b35e6e263
commit 88de2e8407
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.IntegrationTests/PoolManager.Cvars.cs
View File

@@ -35,7 +35,7 @@ public static partial class PoolManager
(CVars.NetBufferSize.Name, "0") (CVars.NetBufferSize.Name, "0")
}; };
public static async Task SetupCVars(RobustIntegrationTest.IntegrationInstance instance, PoolSettings settings) public static async Task SetupCVars(RobustIntegrationTest.IntegrationInstance instance, PoolSettings settings)
{ {
var cfg = instance.ResolveDependency<IConfigurationManager>(); var cfg = instance.ResolveDependency<IConfigurationManager>();
await instance.WaitPost(() => await instance.WaitPost(() =>
@@ -67,4 +67,4 @@ public static partial class PoolManager
options.CVarOverrides[cvar] = value; options.CVarOverrides[cvar] = value;
} }
} }
} }

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

@@ -3,6 +3,8 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Content.IntegrationTests; using Content.IntegrationTests;
using Content.Server.GameTicking;
using Content.Server.Maps;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
using Robust.Server.Player; using Robust.Server.Player;
@@ -10,6 +12,7 @@ using Robust.Shared.GameObjects;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Map.Components; using Robust.Shared.Map.Components;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
using Robust.Shared.Timing; using Robust.Shared.Timing;
using SixLabors.ImageSharp; using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.PixelFormats;
@@ -29,7 +32,8 @@ namespace Content.MapRenderer.Painters
DummyTicker = false, DummyTicker = false,
Connected = true, Connected = true,
Fresh = true, Fresh = true,
Map = map // Seriously whoever made MapPainter use GameMapPrototype I wish you step on a lego one time.
Map = map,
}); });
var server = pair.Server; var server = pair.Server;
@@ -73,7 +77,7 @@ namespace Content.MapRenderer.Painters
sEntityManager.DeleteEntity(playerEntity.Value); sEntityManager.DeleteEntity(playerEntity.Value);
} }
var mapId = sMapManager.GetAllMapIds().Last(); var mapId = sEntityManager.System<GameTicker>().DefaultMap;
grids = sMapManager.GetAllGrids(mapId).ToArray(); grids = sMapManager.GetAllGrids(mapId).ToArray();
foreach (var (uid, _) in grids) foreach (var (uid, _) in grids)