From 7a9d04395a826dbaa5302f598ce2bf7b1fcda2a7 Mon Sep 17 00:00:00 2001 From: Mustafa Alperen Seki Date: Sun, 21 Apr 2019 16:32:21 +0300 Subject: [PATCH] Check for producee's IOccupySpaceInfo for production completation. --- 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 a6153ef411..3d0d9f7415 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 (exitinfo != null && self.OccupiesSpace != null) + if (exitinfo != null && self.OccupiesSpace != null && producee.HasTraitInfo()) { exit = self.Location + exitinfo.ExitCell; var spawn = self.CenterPosition + exitinfo.SpawnOffset; @@ -124,7 +124,7 @@ namespace OpenRA.Mods.Common.Traits // Pick a spawn/exit point pair var exit = SelectExit(self, producee, productionType); - if (exit != null || self.OccupiesSpace == null) + if (exit != null || self.OccupiesSpace == null || !producee.HasTraitInfo()) { DoProduction(self, producee, exit == null ? null : exit.Info, productionType, inits);