From e7fb849e22337d7648bd7609cba56729bc0f9f88 Mon Sep 17 00:00:00 2001 From: DrSmugleaf Date: Wed, 14 Oct 2020 00:19:30 +0200 Subject: [PATCH] Fix StrapComponent erroring when being removed with buckled entities --- Content.Server/GameObjects/Components/Strap/StrapComponent.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Server/GameObjects/Components/Strap/StrapComponent.cs b/Content.Server/GameObjects/Components/Strap/StrapComponent.cs index 96e874b78a..e3d36aa88a 100644 --- a/Content.Server/GameObjects/Components/Strap/StrapComponent.cs +++ b/Content.Server/GameObjects/Components/Strap/StrapComponent.cs @@ -1,5 +1,6 @@ #nullable enable using System.Collections.Generic; +using System.Linq; using Content.Server.GameObjects.Components.Buckle; using Content.Shared.GameObjects.Components.Strap; using Content.Shared.GameObjects.EntitySystems; @@ -150,7 +151,7 @@ namespace Content.Server.GameObjects.Components.Strap { base.OnRemove(); - foreach (var entity in _buckledEntities) + foreach (var entity in _buckledEntities.ToArray()) { if (entity.TryGetComponent(out var buckle)) {