Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix a collection enumeration modification exception in ArrivalsSystem (#22839)

Browse Source 
Fix collection enumeration
This commit is contained in:
Leon Friedrich
2023-12-21 23:19:12 -05:00
committed by GitHub
parent 0b803e5f8d
commit ce5875f29d
1 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Content.Server/Shuttles/Systems/ArrivalsSystem.cs
View File

@@ -56,6 +56,10 @@ public sealed class ArrivalsSystem : EntitySystem
[Dependency] private readonly StationSpawningSystem _stationSpawning = default!; [Dependency] private readonly StationSpawningSystem _stationSpawning = default!;
[Dependency] private readonly StationSystem _station = default!; [Dependency] private readonly StationSystem _station = default!;
private EntityQuery<PendingClockInComponent> _pendingQuery;
private EntityQuery<ArrivalsBlacklistComponent> _blacklistQuery;
private EntityQuery<MobStateComponent> _mobQuery;
/// <summary> /// <summary>
/// If enabled then spawns players on an alternate map so they can take a shuttle to the station. /// If enabled then spawns players on an alternate map so they can take a shuttle to the station.
/// </summary> /// </summary>
@@ -88,6 +92,10 @@ public sealed class ArrivalsSystem : EntitySystem
SubscribeLocalEvent<ArrivalsShuttleComponent, FTLStartedEvent>(OnArrivalsFTL); SubscribeLocalEvent<ArrivalsShuttleComponent, FTLStartedEvent>(OnArrivalsFTL);
SubscribeLocalEvent<ArrivalsShuttleComponent, FTLCompletedEvent>(OnArrivalsDocked); SubscribeLocalEvent<ArrivalsShuttleComponent, FTLCompletedEvent>(OnArrivalsDocked);
_pendingQuery = GetEntityQuery<PendingClockInComponent>();
_blacklistQuery = GetEntityQuery<ArrivalsBlacklistComponent>();
_mobQuery = GetEntityQuery<MobStateComponent>();
// Don't invoke immediately as it will get set in the natural course of things. // Don't invoke immediately as it will get set in the natural course of things.
Enabled = _cfgManager.GetCVar(CCVars.ArrivalsShuttles); Enabled = _cfgManager.GetCVar(CCVars.ArrivalsShuttles);
_cfgManager.OnValueChanged(CCVars.ArrivalsShuttles, SetArrivals); _cfgManager.OnValueChanged(CCVars.ArrivalsShuttles, SetArrivals);
@@ -228,13 +236,7 @@ public sealed class ArrivalsSystem : EntitySystem
// Any mob then yeet them off the shuttle. // Any mob then yeet them off the shuttle.
if (!_cfgManager.GetCVar(CCVars.ArrivalsReturns) && args.FromMapUid != null) if (!_cfgManager.GetCVar(CCVars.ArrivalsReturns) && args.FromMapUid != null)
{ DumpChildren(shuttleUid, ref args);
var pendingEntQuery = GetEntityQuery<PendingClockInComponent>();
var arrivalsBlacklistQuery = GetEntityQuery<ArrivalsBlacklistComponent>();
var mobQuery = GetEntityQuery<MobStateComponent>();
var xformQuery = GetEntityQuery<TransformComponent>();
DumpChildren(shuttleUid, ref args, pendingEntQuery, arrivalsBlacklistQuery, mobQuery, xformQuery);
}
var pendingQuery = AllEntityQuery<PendingClockInComponent, TransformComponent>(); var pendingQuery = AllEntityQuery<PendingClockInComponent, TransformComponent>();
@@ -279,30 +281,35 @@ public sealed class ArrivalsSystem : EntitySystem
} }
} }
private void DumpChildren(EntityUid uid, private void DumpChildren(EntityUid uid, ref FTLStartedEvent args)
ref FTLStartedEvent args,
EntityQuery<PendingClockInComponent> pendingEntQuery,
EntityQuery<ArrivalsBlacklistComponent> arrivalsBlacklistQuery,
EntityQuery<MobStateComponent> mobQuery,
EntityQuery<TransformComponent> xformQuery)
{ {
if (pendingEntQuery.HasComponent(uid)) var toDump = new List<Entity<TransformComponent>>();
return; DumpChildren(uid, ref args, toDump);
foreach (var (ent, xform) in toDump)
var xform = xformQuery.GetComponent(uid);
if (mobQuery.HasComponent(uid) || arrivalsBlacklistQuery.HasComponent(uid))
{ {
var rotation = xform.LocalRotation; var rotation = xform.LocalRotation;
_transform.SetCoordinates(uid, new EntityCoordinates(args.FromMapUid!.Value, args.FTLFrom.Transform(xform.LocalPosition))); _transform.SetCoordinates(ent, new EntityCoordinates(args.FromMapUid!.Value, args.FTLFrom.Transform(xform.LocalPosition)));
_transform.SetWorldRotation(uid, args.FromRotation + rotation); _transform.SetWorldRotation(ent, args.FromRotation + rotation);
}
}
private void DumpChildren(EntityUid uid, ref FTLStartedEvent args, List<Entity<TransformComponent>> toDump)
{
if (_pendingQuery.HasComponent(uid))
return;
var xform = Transform(uid);
if (_mobQuery.HasComponent(uid) || _blacklistQuery.HasComponent(uid))
{
toDump.Add((uid, xform));
return; return;
} }
var children = xform.ChildEnumerator; var children = xform.ChildEnumerator;
while (children.MoveNext(out var child)) while (children.MoveNext(out var child))
{ {
DumpChildren(child, ref args, pendingEntQuery, arrivalsBlacklistQuery, mobQuery, xformQuery); DumpChildren(child, ref args, toDump);
} }
} }