bonkmaykr/ojrc
1
0
Fork 0
mirror of https://git.ngram.ca/OpenJam/rc-servers synced 2026-08-23 23:08:52 +00:00
Code Activity

Add config flag to disallow parties joining the lobby

Browse Source
This commit is contained in:
NG (Graham)
2026-06-22 19:22:28 -04:00
parent dddf1d5337
commit e65d0eeb80
4 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rc_lobby_room/src/lobby.rs
View File

@@ -117,6 +117,7 @@ pub struct QueueHandler {
custom_game_for_user: std::sync::Arc<tokio::sync::RwLock<HashMap<String, String>>>,
users_per_game: usize,
is_enabled: bool,
is_parties_enabled: bool,
hostname: String,
hostport: u16,
network_conf: crate::data::network::NetworkConfigData,
@@ -140,19 +141,21 @@ impl QueueHandler {
) -> Self {
let (domain, port_str) = game_host.split_once(':').expect("Invalid redirect address (must be domain:port)");
let mp_settings = oj_rc_core::ConfigProvider::<()>::multiplayer_settings(conf);
let server_conf = <oj_rc_core::ConfigImpl as oj_rc_core::ConfigProvider<()>>::server_config(conf);
Self {
users_in_queue: std::sync::Arc::new(tokio::sync::Mutex::new(HashMap::new())),
users_in_custom_games_queue: std::sync::Arc::new(tokio::sync::Mutex::new(HashMap::new())),
custom_game_for_user: std::sync::Arc::new(tokio::sync::RwLock::new(HashMap::new())),
users_per_game: oj_rc_core::ConfigProvider::<()>::players_per_game(conf),
is_enabled: mp_settings.is_enabled,
is_parties_enabled: server_conf.allow_parties,
hostname: domain.to_owned(),
hostport: port_str.parse().expect("Invalid redirect port"),
network_conf: crate::data::network::NetworkConfigData::from_conf(oj_rc_core::ConfigProvider::<()>::network_config(conf)),
factory,
cpu_counter,
weapon_guesser,
change_strategy: GamemodeChangeStrategy::from_core(<oj_rc_core::ConfigImpl as oj_rc_core::ConfigProvider<()>>::server_config(conf).queue_mode),
change_strategy: GamemodeChangeStrategy::from_core(server_conf.queue_mode),
autostart_after: mp_settings.lobby_autostart_after,
autostart_task_started: std::sync::atomic::AtomicBool::new(false),
team_choosers: std::sync::Arc::new(team_choosers),
@@ -623,6 +626,15 @@ impl QueueHandler {
});
return;
}
if let Some(platoon_info) = &platoon {
if platoon_info.total != 1 && !self.is_parties_enabled {
event_emitter.emit(crate::events::enqueue_error::QueueJoinError {
code: oj_rc_core::data::error_codes::LobbyReasonCode::PartyNotAllowed as i16,
text: "Platoons are not enabled".to_owned(),
});
return;
}
}
self.ensure_autostart_task_running();