From 00bc3f71fe69a3e06f330e60215f2270180e930e Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Wed, 12 Mar 2014 22:26:33 +0100 Subject: [PATCH] Make Production.SetRallyPoint and .SetPrimaryBuilding more robust --- mods/common/lua/production.lua | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mods/common/lua/production.lua b/mods/common/lua/production.lua index d03b129ef0..5beaa1f899 100644 --- a/mods/common/lua/production.lua +++ b/mods/common/lua/production.lua @@ -17,9 +17,15 @@ Production.PerFactoryQueueIsBusy = function(factory) end Production.SetRallyPoint = function(factory, location) - Actor.Trait(factory, "RallyPoint").rallyPoint = location.Location + local srp = Actor.Trait(factory, "RallyPoint") + if srp ~= nil then + srp.rallyPoint = location.Location + end end Production.SetPrimaryBuilding = function(factory) - Actor.Trait(factory, "PrimaryBuilding"):SetPrimaryProducer(factory, true) + local pb = Actor.TraitOrDefault(factory, "PrimaryBuilding") + if pb ~= nil then + pb:SetPrimaryProducer(factory, true) + end end