epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11574 from obrakmann/fix_non-combatant-unitcratepickup

Browse Source 
Prevent non-combatant players from receiving units from crate pickups
This commit is contained in:
Matthias Mailänder
2016-07-10 15:51:32 +02:00
committed by GitHub
parent da3aaf4318 b080417db3
commit 90439ac64c
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Common/Traits/Crates/DuplicateUnitCrateAction.cs
View File

@@ -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;

3
OpenRA.Mods.Common/Traits/Crates/GiveUnitCrateAction.cs
View File

@@ -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;