From 7dfb9a413c27aae3aeaab4b2dbe003b2a24bc104 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Thu, 8 Oct 2020 06:07:41 +1100 Subject: [PATCH] Fix recycler throwing (#2187) Co-authored-by: Metal Gear Sloth --- .../GameObjects/Components/Recycling/RecyclerComponent.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/GameObjects/Components/Recycling/RecyclerComponent.cs b/Content.Server/GameObjects/Components/Recycling/RecyclerComponent.cs index 0fd2de6886..b3ed01c606 100644 --- a/Content.Server/GameObjects/Components/Recycling/RecyclerComponent.cs +++ b/Content.Server/GameObjects/Components/Recycling/RecyclerComponent.cs @@ -181,7 +181,7 @@ namespace Content.Server.GameObjects.Components.Recycling { var entity = _intersecting[i]; - if (!CanMove(entity) || !_entityManager.IsIntersecting(Owner, entity)) + if (entity.Deleted || !CanMove(entity) || !_entityManager.IsIntersecting(Owner, entity)) { _intersecting.RemoveAt(i); continue;