resolve conflicts and fix formatting

Author: AmyrAhmady

Server/Components/NPCs/Playback/record_manager.hpp

@@ -15,7 +15,10 @@
 class NPCRecordManager
 {
 public:
-	NPCRecordManager() : nextRecordId_(0) { }
+	NPCRecordManager()
+		: nextRecordId_(0)
+	{
+	}
 	~NPCRecordManager() = default;
 
 	int loadRecord(StringView filePath);

Server/Source/player_pool.hpp

@@ -1388,7 +1388,9 @@ struct PlayerPool final : public IPlayerPool, public NetworkEventHandler, public
 			IVehicle& vehicle = *lock.entry;
 			Player& player = static_cast<Player&>(peer);
 
-			if (vehicle.isRespawning())
+			int vehicleModel = vehicle.getModel();
+			// Check if vehicle is a train carriage (TODO: Move Vehicle::isTrainCarriage to SDK/Components/Vehicles/Impl/vehicle_models.hpp)
+			if (vehicle.isRespawning() || (!vehicle.isStreamedInForPlayer(player) && !(vehicleModel == 569 || vehicleModel == 570)))
 			{
 				return false;
 			}