Remove uses of TransformComponent.ChildEntities (#22442)
* Make output of ChildEnumerator non-nullable * Remove uses of ChildEntities * poke tests --------- Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
@@ -772,18 +772,20 @@ public sealed partial class AdminVerbSystem
|
|||||||
{
|
{
|
||||||
foreach (var grid in station.Grids)
|
foreach (var grid in station.Grids)
|
||||||
{
|
{
|
||||||
foreach (var ent in Transform(grid).ChildEntities)
|
var enumerator = Transform(grid).ChildEnumerator;
|
||||||
|
while (enumerator.MoveNext(out var ent))
|
||||||
{
|
{
|
||||||
yield return ent;
|
yield return ent;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (HasComp<MapComponent>(target))
|
else if (HasComp<MapComponent>(target))
|
||||||
{
|
{
|
||||||
foreach (var possibleGrid in Transform(target).ChildEntities)
|
var enumerator = Transform(target).ChildEnumerator;
|
||||||
|
while (enumerator.MoveNext(out var possibleGrid))
|
||||||
{
|
{
|
||||||
foreach (var ent in Transform(possibleGrid).ChildEntities)
|
var enumerator2 = Transform(possibleGrid).ChildEnumerator;
|
||||||
|
while (enumerator2.MoveNext(out var ent))
|
||||||
{
|
{
|
||||||
yield return ent;
|
yield return ent;
|
||||||
}
|
}
|
||||||
@@ -791,7 +793,8 @@ public sealed partial class AdminVerbSystem
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
foreach (var ent in Transform(target).ChildEntities)
|
var enumerator = Transform(target).ChildEnumerator;
|
||||||
|
while (enumerator.MoveNext(out var ent))
|
||||||
{
|
{
|
||||||
yield return ent;
|
yield return ent;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -292,7 +292,7 @@ public sealed partial class CargoSystem
|
|||||||
var children = xform.ChildEnumerator;
|
var children = xform.ChildEnumerator;
|
||||||
while (children.MoveNext(out var child))
|
while (children.MoveNext(out var child))
|
||||||
{
|
{
|
||||||
if (!CanSell(child.Value, _xformQuery.GetComponent(child.Value)))
|
if (!CanSell(child, _xformQuery.GetComponent(child)))
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -342,8 +342,8 @@ public sealed class PricingSystem : EntitySystem
|
|||||||
{
|
{
|
||||||
var xform = Transform(grid);
|
var xform = Transform(grid);
|
||||||
var price = 0.0;
|
var price = 0.0;
|
||||||
|
var enumerator = xform.ChildEnumerator;
|
||||||
foreach (var child in xform.ChildEntities)
|
while (enumerator.MoveNext(out var child))
|
||||||
{
|
{
|
||||||
if (predicate is null || predicate(child))
|
if (predicate is null || predicate(child))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -64,7 +64,9 @@ namespace Content.Server.Construction.Commands
|
|||||||
var changed = 0;
|
var changed = 0;
|
||||||
var tagSystem = _entManager.EntitySysManager.GetEntitySystem<TagSystem>();
|
var tagSystem = _entManager.EntitySysManager.GetEntitySystem<TagSystem>();
|
||||||
|
|
||||||
foreach (var child in xformQuery.GetComponent(gridId.Value).ChildEntities)
|
|
||||||
|
var enumerator = xformQuery.GetComponent(gridId.Value).ChildEnumerator;
|
||||||
|
while (enumerator.MoveNext(out var child))
|
||||||
{
|
{
|
||||||
if (!_entManager.EntityExists(child))
|
if (!_entManager.EntityExists(child))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -72,7 +72,8 @@ namespace Content.Server.Construction.Commands
|
|||||||
var underplating = _tileDefManager[TilePrototypeId];
|
var underplating = _tileDefManager[TilePrototypeId];
|
||||||
var underplatingTile = new Tile(underplating.TileId);
|
var underplatingTile = new Tile(underplating.TileId);
|
||||||
var changed = 0;
|
var changed = 0;
|
||||||
foreach (var child in _entManager.GetComponent<TransformComponent>(gridId.Value).ChildEntities)
|
var enumerator = _entManager.GetComponent<TransformComponent>(gridId.Value).ChildEnumerator;
|
||||||
|
while (enumerator.MoveNext(out var child))
|
||||||
{
|
{
|
||||||
if (!_entManager.EntityExists(child))
|
if (!_entManager.EntityExists(child))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -46,10 +46,9 @@ public sealed class ResaveCommand : LocalizedCommands
|
|||||||
{
|
{
|
||||||
loader.SaveMap(mapId, fn.ToString());
|
loader.SaveMap(mapId, fn.ToString());
|
||||||
}
|
}
|
||||||
else
|
else if (mapXform.ChildEnumerator.MoveNext(out var child))
|
||||||
{
|
{
|
||||||
|
loader.Save(child, fn.ToString());
|
||||||
loader.Save(mapXform.ChildEntities.First(), fn.ToString());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_mapManager.DeleteMap(mapId);
|
_mapManager.DeleteMap(mapId);
|
||||||
|
|||||||
@@ -137,7 +137,7 @@ public sealed class SuitSensorSystem : EntitySystem
|
|||||||
sensor.StationId = stationUid;
|
sensor.StationId = stationUid;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecursiveSensor(child.Value, stationUid, sensorQuery, xformQuery);
|
RecursiveSensor(child, stationUid, sensorQuery, xformQuery);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -454,7 +454,7 @@ public sealed class NPCUtilitySystem : EntitySystem
|
|||||||
|
|
||||||
while (enumerator.MoveNext(out var child))
|
while (enumerator.MoveNext(out var child))
|
||||||
{
|
{
|
||||||
RecursiveAdd(child.Value, entities);
|
RecursiveAdd(child, entities);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -236,10 +236,9 @@ public sealed class ArrivalsSystem : EntitySystem
|
|||||||
}
|
}
|
||||||
|
|
||||||
var children = xform.ChildEnumerator;
|
var children = xform.ChildEnumerator;
|
||||||
|
|
||||||
while (children.MoveNext(out var child))
|
while (children.MoveNext(out var child))
|
||||||
{
|
{
|
||||||
DumpChildren(child.Value, ref args, pendingEntQuery, arrivalsBlacklistQuery, mobQuery, xformQuery);
|
DumpChildren(child, ref args, pendingEntQuery, arrivalsBlacklistQuery, mobQuery, xformQuery);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -501,10 +501,10 @@ public sealed partial class ShuttleSystem
|
|||||||
var childEnumerator = xform.ChildEnumerator;
|
var childEnumerator = xform.ChildEnumerator;
|
||||||
while (childEnumerator.MoveNext(out var child))
|
while (childEnumerator.MoveNext(out var child))
|
||||||
{
|
{
|
||||||
if (!_buckleQuery.TryGetComponent(child.Value, out var buckle) || buckle.Buckled)
|
if (!_buckleQuery.TryGetComponent(child, out var buckle) || buckle.Buckled)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
toKnock.Add(child.Value);
|
toKnock.Add(child);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -148,7 +148,7 @@ public sealed partial class ShuttleSystem
|
|||||||
if (!dockQuery.TryGetComponent(child, out var dock))
|
if (!dockQuery.TryGetComponent(child, out var dock))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
return (child.Value, dock);
|
return (child, dock);
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
@@ -341,7 +341,8 @@ public sealed class TemperatureSystem : EntitySystem
|
|||||||
{
|
{
|
||||||
RecalculateAndApplyParentThresholds(root, temperatureQuery, transformQuery, tempThresholdsQuery);
|
RecalculateAndApplyParentThresholds(root, temperatureQuery, transformQuery, tempThresholdsQuery);
|
||||||
|
|
||||||
foreach (var child in Transform(root).ChildEntities)
|
var enumerator = Transform(root).ChildEnumerator;
|
||||||
|
while (enumerator.MoveNext(out var child))
|
||||||
{
|
{
|
||||||
RecursiveThresholdUpdate(child, temperatureQuery, transformQuery, tempThresholdsQuery);
|
RecursiveThresholdUpdate(child, temperatureQuery, transformQuery, tempThresholdsQuery);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user