Added extra paranoid code to avoid ships targetting temselves.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2891 127b21dd-08f5-0310-b4b7-95ae10353056
2009-12-17 15:05:10 +00:00 · 2009-12-17 15:05:10 +00:00 · c2f3758b2b
commit c2f3758b2b
parent ca8bdfa70e
1 changed files with 11 additions and 1 deletions
--- a/src/Core/Entities/ShipEntity.m
+++ b/src/Core/Entities/ShipEntity.m
@ -5949,7 +5949,17 @@ BOOL class_masslocks(int some_class)

 - (id) primaryTarget
 {
-	return [UNIVERSE entityForUniversalID:primaryTarget];
+	id result = [UNIVERSE entityForUniversalID:primaryTarget];
+	if (EXPECT_NOT(result == self))
+	{
+		/*	Added in response to a crash report showing recursion in
+			[PlayerEntity hasHostileTarget].
+			-- Ahruman 2009-12-17
+		*/
+		result = nil;
+		primaryTarget = NO_TARGET;
+	}
+	return result;
 }