space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-09-06 17:58:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

MapManager query changes (#4090)

Browse Source
This commit is contained in:
metalgearsloth
2023-05-28 23:22:39 +10:00
committed by GitHub
parent 24be915ef1
commit 0ebdd4ac1d
21 changed files with 278 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Robust.Shared/GameObjects/Systems/SharedGridTraversalSystem.cs
+6 -17
View File
@@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using Robust.Shared.IoC;
using Robust.Shared.Map;
@@ -87,16 +86,14 @@ internal sealed class SharedGridTraversalSystem : EntitySystem
var mapPos = moveEvent.NewPosition.ToMapPos(EntityManager, _transform);
// Change parent if necessary
if (_mapManager.TryFindGridAt(xform.MapID, mapPos, out var grid))
if (_mapManager.TryFindGridAt(xform.MapID, mapPos, out var gridUid, out _))
{
var gridUid = grid.Owner;
// Some minor duplication here with AttachParent but only happens when going on/off grid so not a big deal ATM.
if (gridUid != xform.GridUid)
{
_transform.SetParent(entity, xform, gridUid, xforms);
var ev = new ChangedGridEvent(entity, xform.GridUid, gridUid);
RaiseLocalEvent(entity, ref ev, true);
RaiseLocalEvent(entity, ref ev);
}
}
else
@@ -114,18 +111,10 @@ internal sealed class SharedGridTraversalSystem : EntitySystem
}
}
[Obsolete]
[ByRefEvent]
public readonly struct ChangedGridEvent
public readonly record struct ChangedGridEvent(EntityUid Entity, EntityUid? OldGrid, EntityUid? NewGrid)
{
public readonly EntityUid Entity;
public readonly EntityUid? OldGrid;
public readonly EntityUid? NewGrid;
public ChangedGridEvent(EntityUid entity, EntityUid? oldGrid, EntityUid? newGrid)
{
Entity = entity;
OldGrid = oldGrid;
NewGrid = newGrid;
}
public readonly EntityUid Entity = Entity;
public readonly EntityUid? OldGrid = OldGrid;
public readonly EntityUid? NewGrid = NewGrid;
}