Skip to content

Commit 9a7d1a3

Browse files
authored
Replace obsolete functions in GridFixtureSystem (space-wizards#5484)
1 parent 9be903e commit 9a7d1a3

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Robust.Server/Physics/GridFixtureSystem.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ private void CheckSplits(EntityUid uid, HashSet<ChunkSplitNode> dirtyNodes)
285285
foreach (var index in node.Indices)
286286
{
287287
var tilePos = offset + index;
288-
tileData.Add((tilePos, oldGrid.GetTileRef(tilePos).Tile));
288+
tileData.Add((tilePos, _maps.GetTileRef(oldGridUid, oldGrid, tilePos).Tile));
289289
}
290290
}
291291

@@ -355,7 +355,7 @@ private void CheckSplits(EntityUid uid, HashSet<ChunkSplitNode> dirtyNodes)
355355
}
356356

357357
// Set tiles on old grid
358-
oldGrid.SetTiles(tileData);
358+
_maps.SetTiles(oldGridUid, oldGrid, tileData);
359359
GenerateSplitNodes(newGridUid, newGrid);
360360
SendNodeDebug(newGridUid);
361361
}
@@ -388,7 +388,7 @@ private void CheckSplits(EntityUid uid, HashSet<ChunkSplitNode> dirtyNodes)
388388

389389
private void GenerateSplitNodes(EntityUid gridUid, MapGridComponent grid)
390390
{
391-
foreach (var chunk in grid.GetMapChunks().Values)
391+
foreach (var chunk in _maps.GetMapChunks(gridUid, grid).Values)
392392
{
393393
var group = CreateNodes(gridUid, grid, chunk);
394394
_nodes[gridUid].Add(chunk.Indices, group);
@@ -479,7 +479,7 @@ private ChunkNodeGroup CreateNodes(EntityUid gridEuid, MapGridComponent grid, Ma
479479
if (index.X == 0)
480480
{
481481
// Check West
482-
if (grid.TryGetChunk(new Vector2i(chunk.Indices.X - 1, chunk.Indices.Y), out neighborChunk) &&
482+
if (_maps.TryGetChunk(gridEuid, grid, new Vector2i(chunk.Indices.X - 1, chunk.Indices.Y), out neighborChunk) &&
483483
TryGetNode(gridEuid, neighborChunk, new Vector2i(chunk.ChunkSize - 1, index.Y), out neighborNode))
484484
{
485485
chunkNode.Neighbors.Add(neighborNode);
@@ -490,7 +490,7 @@ private ChunkNodeGroup CreateNodes(EntityUid gridEuid, MapGridComponent grid, Ma
490490
if (index.Y == 0)
491491
{
492492
// Check South
493-
if (grid.TryGetChunk(new Vector2i(chunk.Indices.X, chunk.Indices.Y - 1), out neighborChunk) &&
493+
if (_maps.TryGetChunk(gridEuid, grid, new Vector2i(chunk.Indices.X, chunk.Indices.Y - 1), out neighborChunk) &&
494494
TryGetNode(gridEuid, neighborChunk, new Vector2i(index.X, chunk.ChunkSize - 1), out neighborNode))
495495
{
496496
chunkNode.Neighbors.Add(neighborNode);
@@ -501,7 +501,7 @@ private ChunkNodeGroup CreateNodes(EntityUid gridEuid, MapGridComponent grid, Ma
501501
if (index.X == chunk.ChunkSize - 1)
502502
{
503503
// Check East
504-
if (grid.TryGetChunk(new Vector2i(chunk.Indices.X + 1, chunk.Indices.Y), out neighborChunk) &&
504+
if (_maps.TryGetChunk(gridEuid, grid, new Vector2i(chunk.Indices.X + 1, chunk.Indices.Y), out neighborChunk) &&
505505
TryGetNode(gridEuid, neighborChunk, new Vector2i(0, index.Y), out neighborNode))
506506
{
507507
chunkNode.Neighbors.Add(neighborNode);
@@ -512,7 +512,7 @@ private ChunkNodeGroup CreateNodes(EntityUid gridEuid, MapGridComponent grid, Ma
512512
if (index.Y == chunk.ChunkSize - 1)
513513
{
514514
// Check North
515-
if (grid.TryGetChunk(new Vector2i(chunk.Indices.X, chunk.Indices.Y + 1), out neighborChunk) &&
515+
if (_maps.TryGetChunk(gridEuid, grid, new Vector2i(chunk.Indices.X, chunk.Indices.Y + 1), out neighborChunk) &&
516516
TryGetNode(gridEuid, neighborChunk, new Vector2i(index.X, 0), out neighborNode))
517517
{
518518
chunkNode.Neighbors.Add(neighborNode);

0 commit comments

Comments
 (0)