diff --git a/.gitignore b/.gitignore index 07132f1..6076d82 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +*.log + target # Devenv @@ -10,5 +12,3 @@ devenv.local.yaml # pre-commit .pre-commit-config.yaml - -mprocs.log diff --git a/jong/src/main.rs b/jong/src/main.rs index 137cbff..dcb9492 100644 --- a/jong/src/main.rs +++ b/jong/src/main.rs @@ -1,7 +1,14 @@ +use std::fs::File; + use bevy::{log::LogPlugin, prelude::*}; use clap::{Parser, Subcommand}; use tracing::Level; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; +use tracing_subscriber::{ + Layer, + fmt::{self, layer}, + layer::SubscriberExt, + util::SubscriberInitExt, +}; // mod gui; mod tui; @@ -33,6 +40,7 @@ fn main() { Mode::RunTui => { tracing_subscriber::registry() .with(tui_logger::TuiTracingSubscriberLayer) + .with(fmt::layer().with_writer(File::create("jong.log").unwrap())) .init(); tui_logger::init_logger(tui_logger::LevelFilter::Trace).unwrap(); tui_logger::set_env_filter_from_string(FILTERSTRING); diff --git a/jong/src/riichi.rs b/jong/src/riichi.rs index 0a2e319..54040f1 100644 --- a/jong/src/riichi.rs +++ b/jong/src/riichi.rs @@ -180,14 +180,15 @@ fn spawn_main_player( fn spawn_other_player(stdb: &SpacetimeDB, commands: &mut Commands, player: &jong_db::Player) { let id = PlayerOrBot::Player { id: player.id }; - let hand_view = stdb + if let Some(hand_view) = stdb .db() .view_closed_hands() .iter() .find(|v| PlayerOrBot::from(&v.player) == id) - .unwrap(); - let hand_ent = commands.spawn((Hand, Closed(hand_view.hand_length))).id(); - commands.spawn(Player { id }).add_child(hand_ent); + { + let hand_ent = commands.spawn((Hand, Closed(hand_view.hand_length))).id(); + commands.spawn(Player { id }).add_child(hand_ent); + } } fn on_player_insert_update(