Merge pull request #11514 from abcdefg30/64ops

Fix a crash with not space occupying actors granting support powers
This commit is contained in:
reaperrr
2016-06-30 15:35:02 +02:00
committed by GitHub
2 changed files with 11 additions and 4 deletions

View File

@@ -236,7 +236,14 @@ namespace OpenRA.Mods.Common.Traits
return;
var power = Instances.Where(i => !InstanceDisabled(i))
.MinByOrDefault(a => (a.Self.CenterPosition - a.Self.World.Map.CenterOfCell(order.TargetLocation)).HorizontalLengthSquared);
.MinByOrDefault(a =>
{
if (a.Self.OccupiesSpace == null)
return 0;
return (a.Self.CenterPosition - a.Self.World.Map.CenterOfCell(order.TargetLocation)).HorizontalLengthSquared;
});
if (power == null)
return;

View File

@@ -73,13 +73,13 @@ WorldLoaded = function()
Trigger.OnKilled(Biolab, function()
player.MarkCompletedObjective(destroyBiotechCenterObjective)
end)
Trigger.OnCapture(Biolab, function()
Biolab.Kill()
end)
Trigger.OnDamaged(Biolab, HuntTriggerFunction)
AIRepairBuildings(enemy)
AIRebuildHarvesters(enemy)
@@ -101,7 +101,7 @@ end
Tick = function()
if DateTime.GameTime > DateTime.Seconds(5) and player.HasNoRequiredUnits() then
player.MarkFailedObjective(destroyBiotechCenterObjective)
player.MarkFailedObjective(destroyBiotechCenterObjective)
end
end