Spectators added (#2852)

2016-10-12 14:38:45 +02:00
parent 4e33569110
commit cb640ffea4
38 changed files with 396 additions and 36 deletions
--- a/src/Entities/ProjectileEntity.cpp
+++ b/src/Entities/ProjectileEntity.cpp
@@ -167,7 +167,15 @@ public:
 			return false;
 		}

-		if (!a_Entity->IsMob() && !a_Entity->IsMinecart() && !a_Entity->IsPlayer() && !a_Entity->IsBoat())
+		if (
+			!a_Entity->IsMob() &&
+			!a_Entity->IsMinecart() &&
+			(
+				!a_Entity->IsPlayer() ||
+				static_cast<cPlayer *>(a_Entity)->IsGameModeSpectator()
+			) &&
+			!a_Entity->IsBoat()
+		)
 		{
 			// Not an entity that interacts with a projectile
 			return false;