Revert #26994 and #27077 (#27090)

2024-04-18 17:06:56 +02:00
parent b14e6e31ea
commit 5769bf38f8
18 changed files with 112 additions and 69 deletions
--- a/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs
+++ b/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs
@@ -46,14 +46,17 @@ namespace Content.IntegrationTests.Tests.Fluids
            var server = pair.Server;

            var testMap = await pair.CreateTestMap();
-            var grid = testMap.Grid.Comp;

            var entitySystemManager = server.ResolveDependency<IEntitySystemManager>();
            var spillSystem = entitySystemManager.GetEntitySystem<PuddleSystem>();

+            MapGridComponent grid = null;
+
            // Remove all tiles
            await server.WaitPost(() =>
            {
+                grid = testMap.MapGrid;
+
                foreach (var tile in grid.GetAllTiles())
                {
                    grid.SetTile(tile.GridIndices, Tile.Empty);