From b08117dc936b9b291baaa94f0dff56b6c7e032b6 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Wed, 7 Jul 2021 23:41:14 +0100 Subject: [PATCH] Don't report "Primary Building Selected" when nothing changes. --- OpenRA.Mods.Common/Traits/Buildings/PrimaryBuilding.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Buildings/PrimaryBuilding.cs b/OpenRA.Mods.Common/Traits/Buildings/PrimaryBuilding.cs index 49cade1b2e..cc16cb8605 100644 --- a/OpenRA.Mods.Common/Traits/Buildings/PrimaryBuilding.cs +++ b/OpenRA.Mods.Common/Traits/Buildings/PrimaryBuilding.cs @@ -79,9 +79,11 @@ namespace OpenRA.Mods.Common.Traits void IResolveOrder.ResolveOrder(Actor self, Order order) { - var forceRallyPoint = RallyPoint.IsForceSet(order); - if (order.OrderString == OrderID || forceRallyPoint) - SetPrimaryProducer(self, !IsPrimary || forceRallyPoint); + if (order.OrderString == OrderID) + SetPrimaryProducer(self, !IsPrimary); + + if (RallyPoint.IsForceSet(order) && !IsPrimary) + SetPrimaryProducer(self, true); } public void SetPrimaryProducer(Actor self, bool isPrimary)