From 3586f9ad7048982ed2129ae3d7e6037c82ca5107 Mon Sep 17 00:00:00 2001
From: Oliver Brakmann <ob-web2013+github@posteo.net>
Date: Mon, 2 Jun 2014 15:27:50 +0200
Subject: [PATCH] Fix issues in 'intervention' mission

* Fix an InvalidOperationException due to querying traits on a dead
  actor (fixes #5530)
* remove a gap in the SAM belt that shouldn't be there
---
 mods/ra/maps/intervention/map.yaml    | 4 ++++
 mods/ra/maps/intervention/mission.lua | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/mods/ra/maps/intervention/map.yaml b/mods/ra/maps/intervention/map.yaml
index 65df391c5a..1209e74c1f 100644
--- a/mods/ra/maps/intervention/map.yaml
+++ b/mods/ra/maps/intervention/map.yaml
@@ -2261,6 +2261,8 @@ Rules:
 	SAM:
 		Building:
 			Power: -5
+		RevealsShroud:
+			Range: 7c0
 	TSLA:
 		Building:
 			Power: -50
@@ -2328,6 +2330,8 @@ Sequences:
 VoxelSequences:
 
 Weapons:
+	Nike:
+		Range: 9c0
 	Maverick:
 		Warhead:
 			Damage: 175
diff --git a/mods/ra/maps/intervention/mission.lua b/mods/ra/maps/intervention/mission.lua
index 84b805bde9..8f861fe116 100644
--- a/mods/ra/maps/intervention/mission.lua
+++ b/mods/ra/maps/intervention/mission.lua
@@ -192,8 +192,10 @@ SetupWorld = function()
 	Utils.Do(SovietHarvesters, function(harvester)
 		Actor.OnDamaged(harvester, function(h)
 			Team.Do(harvesterGuard, function(g)
-				Actor.Stop(g)
-				Actor.AttackMove(g, h.Location, 3)
+				if not Actor.IsDead(g) then
+					Actor.Stop(g)
+					Actor.AttackMove(g, h.Location, 3)
+				end
 			end)
 		end)
 	end)