From b080417db3d080d07703f4bb8acd971256ae2b4b Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Sun, 3 Jul 2016 22:01:31 +0200 Subject: [PATCH] Prevent non-combatant players from receiving units from crate pickups --- OpenRA.Mods.Common/Traits/Crates/DuplicateUnitCrateAction.cs | 3 +++ OpenRA.Mods.Common/Traits/Crates/GiveUnitCrateAction.cs | 3 +++ 2 files changed, 6 insertions(+) diff --git a/OpenRA.Mods.Common/Traits/Crates/DuplicateUnitCrateAction.cs b/OpenRA.Mods.Common/Traits/Crates/DuplicateUnitCrateAction.cs index 010f6590d1..53702593b7 100644 --- a/OpenRA.Mods.Common/Traits/Crates/DuplicateUnitCrateAction.cs +++ b/OpenRA.Mods.Common/Traits/Crates/DuplicateUnitCrateAction.cs @@ -56,6 +56,9 @@ namespace OpenRA.Mods.Common.Traits public bool CanGiveTo(Actor collector) { + if (collector.Owner.NonCombatant) + return false; + if (info.ValidFactions.Any() && !info.ValidFactions.Contains(collector.Owner.Faction.InternalName)) return false; diff --git a/OpenRA.Mods.Common/Traits/Crates/GiveUnitCrateAction.cs b/OpenRA.Mods.Common/Traits/Crates/GiveUnitCrateAction.cs index 975ce5aeb5..b472cfbd52 100644 --- a/OpenRA.Mods.Common/Traits/Crates/GiveUnitCrateAction.cs +++ b/OpenRA.Mods.Common/Traits/Crates/GiveUnitCrateAction.cs @@ -49,6 +49,9 @@ namespace OpenRA.Mods.Common.Traits public bool CanGiveTo(Actor collector) { + if (collector.Owner.NonCombatant) + return false; + if (info.ValidFactions.Any() && !info.ValidFactions.Contains(collector.Owner.Faction.InternalName)) return false;