@@ -285,7 +285,7 @@ private void CheckSplits(EntityUid uid, HashSet<ChunkSplitNode> dirtyNodes)
285
285
foreach ( var index in node . Indices )
286
286
{
287
287
var tilePos = offset + index ;
288
- tileData . Add ( ( tilePos , oldGrid . GetTileRef ( tilePos ) . Tile ) ) ;
288
+ tileData . Add ( ( tilePos , _maps . GetTileRef ( oldGridUid , oldGrid , tilePos ) . Tile ) ) ;
289
289
}
290
290
}
291
291
@@ -355,7 +355,7 @@ private void CheckSplits(EntityUid uid, HashSet<ChunkSplitNode> dirtyNodes)
355
355
}
356
356
357
357
// Set tiles on old grid
358
- oldGrid . SetTiles ( tileData ) ;
358
+ _maps . SetTiles ( oldGridUid , oldGrid , tileData ) ;
359
359
GenerateSplitNodes ( newGridUid , newGrid ) ;
360
360
SendNodeDebug ( newGridUid ) ;
361
361
}
@@ -388,7 +388,7 @@ private void CheckSplits(EntityUid uid, HashSet<ChunkSplitNode> dirtyNodes)
388
388
389
389
private void GenerateSplitNodes ( EntityUid gridUid , MapGridComponent grid )
390
390
{
391
- foreach ( var chunk in grid . GetMapChunks ( ) . Values )
391
+ foreach ( var chunk in _maps . GetMapChunks ( gridUid , grid ) . Values )
392
392
{
393
393
var group = CreateNodes ( gridUid , grid , chunk ) ;
394
394
_nodes [ gridUid ] . Add ( chunk . Indices , group ) ;
@@ -479,7 +479,7 @@ private ChunkNodeGroup CreateNodes(EntityUid gridEuid, MapGridComponent grid, Ma
479
479
if ( index . X == 0 )
480
480
{
481
481
// 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 ) &&
483
483
TryGetNode ( gridEuid , neighborChunk , new Vector2i ( chunk . ChunkSize - 1 , index . Y ) , out neighborNode ) )
484
484
{
485
485
chunkNode . Neighbors . Add ( neighborNode ) ;
@@ -490,7 +490,7 @@ private ChunkNodeGroup CreateNodes(EntityUid gridEuid, MapGridComponent grid, Ma
490
490
if ( index . Y == 0 )
491
491
{
492
492
// 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 ) &&
494
494
TryGetNode ( gridEuid , neighborChunk , new Vector2i ( index . X , chunk . ChunkSize - 1 ) , out neighborNode ) )
495
495
{
496
496
chunkNode . Neighbors . Add ( neighborNode ) ;
@@ -501,7 +501,7 @@ private ChunkNodeGroup CreateNodes(EntityUid gridEuid, MapGridComponent grid, Ma
501
501
if ( index . X == chunk . ChunkSize - 1 )
502
502
{
503
503
// 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 ) &&
505
505
TryGetNode ( gridEuid , neighborChunk , new Vector2i ( 0 , index . Y ) , out neighborNode ) )
506
506
{
507
507
chunkNode . Neighbors . Add ( neighborNode ) ;
@@ -512,7 +512,7 @@ private ChunkNodeGroup CreateNodes(EntityUid gridEuid, MapGridComponent grid, Ma
512
512
if ( index . Y == chunk . ChunkSize - 1 )
513
513
{
514
514
// 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 ) &&
516
516
TryGetNode ( gridEuid , neighborChunk , new Vector2i ( index . X , 0 ) , out neighborNode ) )
517
517
{
518
518
chunkNode . Neighbors . Add ( neighborNode ) ;
0 commit comments