From 4ddd2a7fb1afe25b793f0eb132790299a5a3814f Mon Sep 17 00:00:00 2001
From: quantumstate <quantumstate@wildfiregames.com>
Date: Tue, 12 Jun 2012 12:13:24 +0000
Subject: [PATCH] Added IsInWorld check to attack code.  Refs #1496

This was SVN commit r11967.
---
 binaries/data/mods/public/simulation/components/Attack.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/binaries/data/mods/public/simulation/components/Attack.js b/binaries/data/mods/public/simulation/components/Attack.js
index f5cf44c7ef..30943170f9 100644
--- a/binaries/data/mods/public/simulation/components/Attack.js
+++ b/binaries/data/mods/public/simulation/components/Attack.js
@@ -501,11 +501,11 @@ Attack.prototype.TargetKilled = function(killerEntity, targetEntity)
 
 Attack.prototype.InterpolatedLocation = function(ent, lateness)
 {
-	var targetPositionCmp = Engine.QueryInterface(ent, IID_Position);
-	if (!targetPositionCmp) // TODO: handle dead target properly
+	var cmpTargetPosition = Engine.QueryInterface(ent, IID_Position);
+	if (!cmpTargetPosition || !cmpTargetPosition.IsInWorld()) // TODO: handle dead target properly
 		return undefined;
-	var curPos = targetPositionCmp.GetPosition();
-	var prevPos = targetPositionCmp.GetPreviousPosition();
+	var curPos = cmpTargetPosition.GetPosition();
+	var prevPos = cmpTargetPosition.GetPreviousPosition();
 	lateness /= 1000;
 	return {"x": (curPos.x * (this.turnLength - lateness) + prevPos.x * lateness) / this.turnLength,
 	        "z": (curPos.z * (this.turnLength - lateness) + prevPos.z * lateness) / this.turnLength};