Cloaked ships do mass lock the player now.

OoliteProject · Jul 18, 2020 · 4f19c98 · 4f19c98
1 parent 94d89fd
commit 4f19c98
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/Core/Entities/PlayerEntity.m b/src/Core/Entities/PlayerEntity.m
@@ -3289,6 +3289,7 @@ - (void) setMaxFlightYaw:(GLfloat)new
 - (BOOL) checkEntityForMassLock:(Entity *)ent withScanClass:(int)theirClass
 {
 	BOOL massLocked = NO;
+	BOOL entIsCloakedShip = [ent isShip] && [(ShipEntity *)ent isCloaked];
 
 	if (EXPECT_NOT([ent isStellarObject]))
 	{
@@ -3308,8 +3309,7 @@ - (BOOL) checkEntityForMassLock:(Entity *)ent withScanClass:(int)theirClass
 	}
 	else if (theirClass != CLASS_NO_DRAW)
 	{
-		// cloaked ships do not mass lock!
-		if (EXPECT_NOT ([ent isShip] && [(ShipEntity *)ent isCloaked]))
+		if (EXPECT_NOT (entIsCloakedShip)
 		{
 			theirClass = CLASS_NO_DRAW;
 		}
@@ -3320,6 +3320,12 @@ - (BOOL) checkEntityForMassLock:(Entity *)ent withScanClass:(int)theirClass
 		switch (theirClass)
 		{
 			case CLASS_NO_DRAW:
+				// cloaked ships do mass lock! - Nikos 20200718
+				if (entIsCloakedShip && ![ent isPlayer])
+				{
+					massLocked = YES;
+				}
+				break;
 			case CLASS_PLAYER:
 			case CLASS_BUOY:
 			case CLASS_ROCK: