From 6b93f955a46b677c9349784ccf3c9c453d9c353a Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Tue, 30 Mar 2021 09:52:28 +0200 Subject: [PATCH] Fix a crash in LevelUpCrateAction --- OpenRA.Mods.Common/Traits/Crates/LevelUpCrateAction.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Crates/LevelUpCrateAction.cs b/OpenRA.Mods.Common/Traits/Crates/LevelUpCrateAction.cs index b3648d8c4d..a8ebec57bd 100644 --- a/OpenRA.Mods.Common/Traits/Crates/LevelUpCrateAction.cs +++ b/OpenRA.Mods.Common/Traits/Crates/LevelUpCrateAction.cs @@ -67,12 +67,12 @@ namespace OpenRA.Mods.Common.Traits if (info.MaxExtraCollectors > -1) inRange = inRange.Take(info.MaxExtraCollectors); - foreach (var actor in inRange.Append(collector)) + foreach (var recipient in inRange.Append(collector)) { - var recipient = actor; // loop variable in closure hazard recipient.World.AddFrameEndTask(w => { - recipient.TraitOrDefault()?.GiveLevels(info.Levels); + if (!recipient.IsDead) + recipient.TraitOrDefault()?.GiveLevels(info.Levels); }); }