disable spectating when spectated vehicle is removed

openmultiplayer · Oct 14, 2023 · da79040 · da79040
1 parent 2e184f0
commit da79040
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/Server/Components/Vehicles/vehicle.cpp b/Server/Components/Vehicles/vehicle.cpp
@@ -810,6 +810,15 @@ void Vehicle::destream()
 			vehicleData->setVehicle(nullptr, 0);
 		}
 
+		// Related issue: https://github.com/openmultiplayer/open.mp/issues/735
+		// Disable spectator's spectating state when spectated vehicle is removed
+		// This also makes spectateData values to be accurate and not remain with old data
+		auto spectateData = player->getSpectateData();
+		if (spectateData.type == PlayerSpectateData::ESpectateType::Vehicle && spectateData.spectateID == poolID)
+		{
+			player->setSpectating(false);
+		}
+
 		if (isStreamedInForPlayer(*player))
 		{
 			streamOutForClient(*player);