From f9ef41f1658882387651cb6d1a44766014d42198 Mon Sep 17 00:00:00 2001 From: Mustafa Alperen Seki Date: Sat, 20 Apr 2019 20:38:43 +0300 Subject: [PATCH] Properly check for exitinfo != null in DoProduction() --- OpenRA.Mods.Common/Traits/Production.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Production.cs b/OpenRA.Mods.Common/Traits/Production.cs index ee8d38a451..a6153ef411 100644 --- a/OpenRA.Mods.Common/Traits/Production.cs +++ b/OpenRA.Mods.Common/Traits/Production.cs @@ -50,7 +50,7 @@ namespace OpenRA.Mods.Common.Traits foreach (var init in inits) td.Add(init); - if (self.OccupiesSpace != null) + if (exitinfo != null && self.OccupiesSpace != null) { exit = self.Location + exitinfo.ExitCell; var spawn = self.CenterPosition + exitinfo.SpawnOffset; @@ -82,7 +82,7 @@ namespace OpenRA.Mods.Common.Traits var newUnit = self.World.CreateActor(producee.Name, td); var move = newUnit.TraitOrDefault(); - if (move != null) + if (exitinfo != null && move != null) { if (exitinfo.MoveIntoWorld) {