Entities designated as excepted for collision with the player will no…

…w not limit the torus speed variability. Thanks to Milo for this contribution.
OoliteProject · Jul 11, 2020 · 07e2ddb · 07e2ddb
1 parent 91ad883
commit 07e2ddb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Doc/contributors.txt b/Doc/contributors.txt
@@ -32,6 +32,7 @@ Olli Krienke (Svengali)
 Lazygun
 Dave MacLachlan (Jester)
 MaddTheSane
+Milo
 Chris Morris (cim)
 Steve Murphy (Capt. Murphy)
 Norbert Nagy (Norby)

diff --git a/src/Core/Entities/PlayerEntity.m b/src/Core/Entities/PlayerEntity.m
@@ -3170,7 +3170,7 @@ - (void) updateAlertConditionForNearbyEntities
 		if (EXPECT_NOT(needHyperspeedNearest))
 		{
 			// not visual effects, waypoints, ships, etc.
-			if (scannedEntity != self && [scannedEntity canCollide])
+			if (scannedEntity != self && [scannedEntity canCollide] && (![scannedEntity isShip] || ![self collisionExceptedFor:(ShipEntity *) scannedEntity]))
 			{
 				hsnDistance = sqrt(scannedEntity->zero_distance)-[scannedEntity collisionRadius];
 				needHyperspeedNearest = NO;