From 526a331e28259d38c7223efb46b836998f37f2eb Mon Sep 17 00:00:00 2001 From: Paul1365972 Date: Wed, 18 Nov 2026 22:33:13 +0100 Subject: [PATCH 1/9] fix(network): reject VarInts longer than five bytes instead of panicking --- crates/network/src/packets/mod.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/crates/network/src/packets/mod.rs b/crates/network/src/packets/mod.rs index dfedcb441..6c37e2a06 100644 --- a/crates/network/src/packets/mod.rs +++ b/crates/network/src/packets/mod.rs @@ -49,6 +49,7 @@ pub enum PacketDecodeError { FromUtf8(std::string::FromUtf8Error), Nbt(nbt::Error), UnsupportedSlotComponent(i32), + VarIntTooBig, } impl From for PacketDecodeError { @@ -289,13 +290,13 @@ pub trait PacketDecoderExt: Read + Sized { let mut read; loop { read = self.read_byte()? as u8; + if num_read == 5 { + return Err(PacketDecodeError::VarIntTooBig); + } let value = (read & 0b0111_1111) as i32; result |= value << (7 * num_read); num_read += 1; - if num_read > 5 { - panic!("VarInt is too big!"); - } if read & 0b1000_0000 == 0 { break; } From 08c96c8e2c6e48f3720b18a47c0dbcda1d25a1b0 Mon Sep 17 00:00:00 2001 From: Paul1365972 Date: Wed, 18 Nov 2026 22:34:13 +0100 Subject: [PATCH 2/9] fix(network): drop connections that close before entering play --- crates/network/src/lib.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/crates/network/src/lib.rs b/crates/network/src/lib.rs index 4b5925ab6..7278d07a0 100644 --- a/crates/network/src/lib.rs +++ b/crates/network/src/lib.rs @@ -48,6 +48,7 @@ pub enum NetworkState { pub struct HandshakingConn { client: NetworkClient, + alive: bool, pub username: Option, pub uuid: Option, pub forwarding_message_id: Option, @@ -59,8 +60,8 @@ impl HandshakingConn { self.client.send_packet(data); } - pub fn receive_packets(&self) -> Vec> { - self.client.receive_packets(&mut true) + pub fn receive_packets(&mut self) -> Vec> { + self.client.receive_packets(&mut self.alive) } pub fn set_compressed(&self, compressed: bool) { @@ -220,10 +221,12 @@ impl NetworkServer { } pub fn update(&mut self) { + self.handshaking_clients.retain(|client| client.alive); loop { match self.client_receiver.try_recv() { Ok(client) => self.handshaking_clients.push(HandshakingConn { client, + alive: true, username: None, uuid: None, forwarding_message_id: None, From 9b31903804978c9273ff64bafaf4b539c42ea96e Mon Sep 17 00:00:00 2001 From: Paul1365972 Date: Wed, 18 Nov 2026 22:35:13 +0100 Subject: [PATCH 3/9] fix(player): close the connection when kicking --- crates/core/src/player.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/crates/core/src/player.rs b/crates/core/src/player.rs index 62feb84b9..b00425aa4 100644 --- a/crates/core/src/player.rs +++ b/crates/core/src/player.rs @@ -478,11 +478,10 @@ impl Player { self.client.send_packet(&cui_plugin_message); } - /// Sends the player the disconnect packet, it is still up to the player to end the network - /// stream. - pub fn kick(&self, reason: TextComponent) { + pub fn kick(&mut self, reason: TextComponent) { let disconnect = CDisconnect { reason }.encode(); self.client.send_packet(&disconnect); + self.client.close_connection(); } pub fn update_player_abilities(&self) { From 61f7ba0ab2f9ba31f3439a24fe84d4e404ce0652 Mon Sep 17 00:00:00 2001 From: Paul1365972 Date: Wed, 18 Nov 2026 22:36:13 +0100 Subject: [PATCH 4/9] fix(core): give each plot its own broadcast queue --- Cargo.lock | 50 ------------------------------------- Cargo.toml | 1 - crates/core/Cargo.toml | 1 - crates/core/src/plot/mod.rs | 9 +++---- crates/core/src/server.rs | 32 +++++++++++++----------- 5 files changed, 22 insertions(+), 71 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ea661f73a..f76004c32 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -212,17 +212,6 @@ version = "3.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" -[[package]] -name = "bus" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b7118d0221d84fada881b657c2ddb7cd55108db79c8764c9ee212c0c259b783" -dependencies = [ - "crossbeam-channel", - "num_cpus", - "parking_lot_core", -] - [[package]] name = "byteorder" version = "1.5.0" @@ -841,12 +830,6 @@ dependencies = [ "serde", ] -[[package]] -name = "hermit-abi" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" - [[package]] name = "hmac" version = "0.12.1" @@ -1329,7 +1312,6 @@ dependencies = [ "backtrace", "bincode", "bitflags", - "bus", "byteorder", "ctrlc", "hematite-nbt", @@ -1666,16 +1648,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "objc2" version = "0.6.4" @@ -1724,19 +1696,6 @@ version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d211803b9b6b570f68772237e415a029d5a50c65d382910b879fb19d3271f94d" -[[package]] -name = "parking_lot_core" -version = "0.9.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-link", -] - [[package]] name = "paste" version = "1.0.15" @@ -1984,15 +1943,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "redox_syscall" -version = "0.5.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" -dependencies = [ - "bitflags", -] - [[package]] name = "regex" version = "1.12.3" diff --git a/Cargo.toml b/Cargo.toml index ee9d962d2..eac3dd467 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,7 +57,6 @@ bitflags = "2.6" serde = "1" serde_json = "1.0" md5 = "0.8" -bus = "2.2" ctrlc = "3.1" tracing = "0.1" rand = "0.10" diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 41cd28268..6516b1f57 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -31,7 +31,6 @@ bitflags = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } md5 = { workspace = true } -bus = { workspace = true } ctrlc = { workspace = true, features = ["termination"] } tracing = { workspace = true } rand = { workspace = true } diff --git a/crates/core/src/plot/mod.rs b/crates/core/src/plot/mod.rs index af24ea017..f69b4f332 100644 --- a/crates/core/src/plot/mod.rs +++ b/crates/core/src/plot/mod.rs @@ -13,7 +13,6 @@ use crate::player::{EntityId, Gamemode, PacketSender, Player, PlayerPos}; use crate::server::{BroadcastMessage, Message, PrivMessage}; use crate::utils::HyphenatedUUID; use anyhow::Error; -use bus::BusReader; use itertools::Itertools; use mchprs_blocks::block_entities::BlockEntity; use mchprs_blocks::blocks::Block; @@ -66,7 +65,7 @@ pub struct Plot { pub redpiler: Compiler, // Thread communication - message_receiver: BusReader, + message_receiver: Receiver, message_sender: Sender, priv_message_receiver: Receiver, @@ -1151,7 +1150,7 @@ impl Plot { plot_data: PlotData, x: i32, z: i32, - rx: BusReader, + rx: Receiver, tx: Sender, priv_rx: Receiver, always_running: bool, @@ -1214,7 +1213,7 @@ impl Plot { fn load( x: i32, z: i32, - rx: BusReader, + rx: Receiver, tx: Sender, priv_rx: Receiver, always_running: bool, @@ -1298,7 +1297,7 @@ impl Plot { pub fn load_and_run( x: i32, z: i32, - rx: BusReader, + rx: Receiver, tx: Sender, priv_rx: Receiver, always_running: bool, diff --git a/crates/core/src/server.rs b/crates/core/src/server.rs index 853da0151..915efce9b 100644 --- a/crates/core/src/server.rs +++ b/crates/core/src/server.rs @@ -5,7 +5,6 @@ use crate::plot::{self, database, Plot, PLOT_BLOCK_HEIGHT}; use crate::utils::HyphenatedUUID; use crate::{permissions, utils}; use backtrace::Backtrace; -use bus::Bus; use hmac::{Hmac, Mac}; use mchprs_network::packets::clientbound::{ CConfigurationPluginMessage, CDisconnectLogin, CFinishConfiguration, CGameEvent, @@ -110,6 +109,7 @@ struct PlayerListEntry { struct PlotListEntry { plot_x: i32, plot_z: i32, + broadcast_sender: mpsc::Sender, priv_message_sender: mpsc::Sender, } @@ -122,7 +122,6 @@ struct WhitelistEntry { /// This represents a minecraft server pub struct MinecraftServer { network: NetworkServer, - broadcaster: Bus, receiver: Receiver, plot_sender: Sender, online_players: FxHashMap, @@ -154,7 +153,6 @@ impl MinecraftServer { // Create thread messaging structs let (plot_tx, server_rx) = mpsc::channel(); - let bus = Bus::new(100); let ctrl_handler_sender = plot_tx.clone(); ctrlc::set_handler(move || { @@ -185,7 +183,6 @@ impl MinecraftServer { // Create server struct let mut server = MinecraftServer { network: NetworkServer::new(bind_addr), - broadcaster: bus, receiver: server_rx, plot_sender: plot_tx, online_players: FxHashMap::default(), @@ -195,11 +192,12 @@ impl MinecraftServer { // Load the spawn area plot on server start // This plot should be always active + let (broadcast_tx, broadcast_rx) = mpsc::channel(); let (spawn_tx, spawn_rx) = mpsc::channel(); Plot::load_and_run( 0, 0, - server.broadcaster.add_rx(), + broadcast_rx, server.plot_sender.clone(), spawn_rx, true, @@ -208,6 +206,7 @@ impl MinecraftServer { server.running_plots.push(PlotListEntry { plot_x: 0, plot_z: 0, + broadcast_sender: broadcast_tx, priv_message_sender: spawn_tx, }); @@ -228,6 +227,12 @@ impl MinecraftServer { } } + fn broadcast(&self, message: BroadcastMessage) { + for plot in &self.running_plots { + let _ = plot.broadcast_sender.send(message.clone()); + } + } + /// Removes the plot entry from the `running_plots` list fn handle_plot_unload(&mut self, plot_x: i32, plot_z: i32) { let index = self @@ -241,7 +246,7 @@ impl MinecraftServer { fn graceful_shutdown(&mut self) { info!("Commencing graceful shutdown..."); - self.broadcaster.broadcast(BroadcastMessage::Shutdown); + self.broadcast(BroadcastMessage::Shutdown); // Wait for all plots to save and unload while !self.running_plots.is_empty() { while let Ok(message) = self.receiver.try_recv() { @@ -276,11 +281,12 @@ impl MinecraftServer { .iter() .any(|p| p.plot_x == plot_x && p.plot_z == plot_z); if !plot_loaded { + let (broadcast_tx, broadcast_rx) = mpsc::channel(); let (priv_tx, priv_rx) = mpsc::channel(); Plot::load_and_run( plot_x, plot_z, - self.broadcaster.add_rx(), + broadcast_rx, self.plot_sender.clone(), priv_rx, false, @@ -289,6 +295,7 @@ impl MinecraftServer { self.running_plots.push(PlotListEntry { plot_x, plot_z, + broadcast_sender: broadcast_tx, priv_message_sender: priv_tx, }); } else { @@ -520,21 +527,19 @@ impl MinecraftServer { properties: player.properties.clone(), }; database::ensure_user(&format!("{:032x}", player.uuid), &player.username); - self.broadcaster - .broadcast(BroadcastMessage::PlayerJoinedInfo(player_join_info)); + self.broadcast(BroadcastMessage::PlayerJoinedInfo(player_join_info)); self.send_player_to_plot(player, true); } Message::PlayerLeft(uuid) => { if let Some((_, player)) = self.online_players.remove_entry(&uuid) { info!("{} left the game", player.username); } - self.broadcaster - .broadcast(BroadcastMessage::PlayerLeft(uuid)); + self.broadcast(BroadcastMessage::PlayerLeft(uuid)); } Message::PlotUnload(plot_x, plot_z) => self.handle_plot_unload(plot_x, plot_z), Message::ChatInfo(uuid, username, message) => { info!("<{}> {}", username, message); - self.broadcaster.broadcast(BroadcastMessage::Chat( + self.broadcast(BroadcastMessage::Chat( uuid, TextComponent::from_legacy_text( &CONFIG @@ -588,8 +593,7 @@ impl MinecraftServer { if let Some(player) = self.online_players.get_mut(&uuid) { player.gamemode = gamemode; } - self.broadcaster - .broadcast(BroadcastMessage::PlayerUpdateGamemode(uuid, gamemode)); + self.broadcast(BroadcastMessage::PlayerUpdateGamemode(uuid, gamemode)); } Message::WhitelistAdd(uuid, username, sender) => { self.update_whitelist(sender, |whitelist| { From 0b2f3616a9edf3553799eefdfbd99e398601e241 Mon Sep 17 00:00:00 2001 From: Paul1365972 Date: Wed, 18 Nov 2026 22:37:13 +0100 Subject: [PATCH 5/9] fix(core): close connections that acknowledge a login they never completed --- crates/core/src/server.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/crates/core/src/server.rs b/crates/core/src/server.rs index 915efce9b..6e6e22da0 100644 --- a/crates/core/src/server.rs +++ b/crates/core/src/server.rs @@ -755,8 +755,13 @@ impl ServerBoundPacketHandler for MinecraftServer { _login_acknowledged: SLoginAcknowledged, client_idx: usize, ) { + let clients = &mut self.network.handshaking_clients; + if clients[client_idx].uuid.is_none() { + clients.remove(client_idx).close_connection(); + return; + } // The client has been switched to the Configuration state - let client = &mut self.network.handshaking_clients[client_idx]; + let client = &mut clients[client_idx]; // Sends the custom brand name to the player // (This can be seen in the f3 debug menu in-game) From 14927de3cfcb8a07b09c412c5c28d2e95491fb15 Mon Sep 17 00:00:00 2001 From: Paul1365972 Date: Wed, 18 Nov 2026 22:38:13 +0100 Subject: [PATCH 6/9] fix(core): refuse the login when LuckPerms permissions cannot be loaded --- crates/core/src/player.rs | 28 ++++++++++++++++++++-------- crates/core/src/server.rs | 23 +++++++++++++++++++++-- 2 files changed, 41 insertions(+), 10 deletions(-) diff --git a/crates/core/src/player.rs b/crates/core/src/player.rs index b00425aa4..3b49f4295 100644 --- a/crates/core/src/player.rs +++ b/crates/core/src/player.rs @@ -1,5 +1,4 @@ -use crate::config::CONFIG; -use crate::permissions::{self, PlayerPermissionsCache}; +use crate::permissions::PlayerPermissionsCache; use crate::plot::worldedit::WorldEditUndo; use crate::plot::PLOT_SCALE; use crate::utils::{self, HyphenatedUUID}; @@ -196,6 +195,7 @@ impl Player { uuid: u128, username: String, properties: Vec, + permissions_cache: Option, client: PlayerConn, ) -> Player { // Load inventory @@ -203,10 +203,6 @@ impl Player { for entry in player_data.inventory { inventory[entry.slot as usize] = Some(entry.get_item_stack()); } - let permissions_cache = CONFIG - .luckperms - .is_some() - .then(|| permissions::load_player_cache(uuid).unwrap()); Player { uuid, username, @@ -250,6 +246,7 @@ impl Player { uuid: u128, username: String, properties: Vec, + permissions_cache: Option, client: PlayerConn, ) -> Player { let filename = format!("./world/players/{:032x}", uuid); @@ -266,14 +263,29 @@ impl Player { uuid, username, properties, + permissions_cache, client, ); } }; - Player::from_data(player_data, uuid, username, properties, client) + Player::from_data( + player_data, + uuid, + username, + properties, + permissions_cache, + client, + ) } else { - Player::from_data(Default::default(), uuid, username, properties, client) + Player::from_data( + Default::default(), + uuid, + username, + properties, + permissions_cache, + client, + ) } } diff --git a/crates/core/src/server.rs b/crates/core/src/server.rs index 6e6e22da0..7fdf05397 100644 --- a/crates/core/src/server.rs +++ b/crates/core/src/server.rs @@ -7,7 +7,7 @@ use crate::{permissions, utils}; use backtrace::Backtrace; use hmac::{Hmac, Mac}; use mchprs_network::packets::clientbound::{ - CConfigurationPluginMessage, CDisconnectLogin, CFinishConfiguration, CGameEvent, + CConfigurationPluginMessage, CDisconnect, CDisconnectLogin, CFinishConfiguration, CGameEvent, CGameEventType, CKnownPacks, CKnownPacksEntry, CLogin, CLoginPluginRequest, CLoginSuccess, CPlayerInfoActions, CPlayerInfoAddPlayer, CPlayerInfoUpdate, CPlayerInfoUpdatePlayer, CPong, CRegistryData, CRegistryDataEntry, CSetCompression, CSetContainerContent, CSetHeldItem, @@ -316,7 +316,26 @@ impl MinecraftServer { let uuid = client.uuid.unwrap(); let username = client.username.clone().unwrap(); let properties = client.properties.clone(); - let player = Player::load_player(uuid, username, properties, client.into()); + let permissions_cache = match CONFIG + .luckperms + .is_some() + .then(|| permissions::load_player_cache(uuid)) + .transpose() + { + Ok(permissions_cache) => permissions_cache, + Err(err) => { + error!("Failed to load permissions for {username}: {err:?}"); + let disconnect = CDisconnect { + reason: "Could not load your permissions. Please try again later.".into(), + } + .encode(); + client.send_packet(&disconnect); + client.close_connection(); + return; + } + }; + let player = + Player::load_player(uuid, username, properties, permissions_cache, client.into()); let join_game = CLogin { entity_id: player.entity_id as i32, From 239eed8f833256bf78df18e8ac276eecdfebaa3d Mon Sep 17 00:00:00 2001 From: Paul1365972 Date: Wed, 18 Nov 2026 22:39:13 +0100 Subject: [PATCH 7/9] fix(permissions): stop matching past the end of a shorter node --- crates/core/src/permissions/mod.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/crates/core/src/permissions/mod.rs b/crates/core/src/permissions/mod.rs index a2d5db67d..dd481e2a4 100644 --- a/crates/core/src/permissions/mod.rs +++ b/crates/core/src/permissions/mod.rs @@ -40,9 +40,10 @@ impl PermissionNode { } for (i, segment) in str.split('.').enumerate() { - match &self.path[i] { - PathSegment::WildCard => return true, - PathSegment::Named(name) => { + match self.path.get(i) { + None => return false, + Some(PathSegment::WildCard) => return true, + Some(PathSegment::Named(name)) => { if name != segment { return false; } From a574d4fd369dcd7f407271aa08bd54c5ec1c75d2 Mon Sep 17 00:00:00 2001 From: Paul1365972 Date: Wed, 18 Nov 2026 22:40:13 +0100 Subject: [PATCH 8/9] fix(plot): reject relative plot coordinates that overflow --- crates/core/src/plot/commands.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/crates/core/src/plot/commands.rs b/crates/core/src/plot/commands.rs index 995c0a5bb..003f9700c 100644 --- a/crates/core/src/plot/commands.rs +++ b/crates/core/src/plot/commands.rs @@ -32,6 +32,14 @@ fn parse_relative_coord>( } } +fn parse_relative_plot_coord(coord: &str, ref_coord: i32) -> Option { + match coord.strip_prefix('~') { + Some("") => Some(ref_coord), + Some(offset) => ref_coord.checked_add(offset.parse().ok()?), + None => coord.parse().ok(), + } +} + impl Plot { /// Handles a command that starts with `/plot` or `/p` fn handle_plot_command(&mut self, player: usize, command: &str, args: &[&str]) { @@ -129,13 +137,13 @@ impl Plot { let new_plot_x; let new_plot_z; - if let Ok(x_arg) = parse_relative_coord(args[0], plot_x) { + if let Some(x_arg) = parse_relative_plot_coord(args[0], plot_x) { new_plot_x = x_arg; } else { self.players[player].send_error_message("Unable to parse x coordinate!"); return; } - if let Ok(z_arg) = parse_relative_coord(args[1], plot_z) { + if let Some(z_arg) = parse_relative_plot_coord(args[1], plot_z) { new_plot_z = z_arg; } else { self.players[player].send_error_message("Unable to parse z coordinate!"); From 514973ca89132124816012546c824a760adce3e9 Mon Sep 17 00:00:00 2001 From: Paul1365972 Date: Wed, 18 Nov 2026 22:41:13 +0100 Subject: [PATCH 9/9] fix(core): match the whole name in /tp and teleport to that player --- crates/core/src/server.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/core/src/server.rs b/crates/core/src/server.rs index 7fdf05397..35f2fd731 100644 --- a/crates/core/src/server.rs +++ b/crates/core/src/server.rs @@ -575,14 +575,14 @@ impl MinecraftServer { self.graceful_shutdown(); } Message::PlayerTeleportOther(player, other_username) => { - let username_lower = other_username.to_lowercase(); if let Some((_, other_player)) = self .online_players .iter() - .find(|(_, p)| p.username.to_lowercase().starts_with(&username_lower)) + .find(|(_, p)| p.username.eq_ignore_ascii_case(&other_username)) { let plot_x = other_player.plot_x; let plot_z = other_player.plot_z; + let other_username = other_player.username.clone(); let plot_loaded = self .running_plots