From 74a810b956b53197240dd9949a7e475678501618 Mon Sep 17 00:00:00 2001 From: ErrorNoInternet Date: Sat, 8 Mar 2025 15:52:45 -0500 Subject: [PATCH] refactor: ignore errors for unknown commands --- src/events.rs | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/src/events.rs b/src/events.rs index 8797f33..ac17220 100644 --- a/src/events.rs +++ b/src/events.rs @@ -5,7 +5,10 @@ use crate::{ lua::{self, direction::Direction, player::Player, vec3::Vec3}, particle, }; -use azalea::{prelude::*, protocol::packets::game::ClientboundGamePacket}; +use azalea::{ + brigadier::exceptions::BuiltInExceptions::DispatcherUnknownCommand, prelude::*, + protocol::packets::game::ClientboundGamePacket, +}; use hyper::{server::conn::http1, service::service_fn}; use hyper_util::rt::TokioIo; use log::{debug, error, info, trace}; @@ -44,8 +47,9 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> anyhow: info!("decrypted message from {sender}: {content}"); } - if is_whisper && globals.get::>("Owners")?.contains(sender) { - if let Err(error) = state.commands.execute( + if is_whisper + && globals.get::>("Owners")?.contains(sender) + && let Err(error) = state.commands.execute( content.clone(), CommandSource { client: client.clone(), @@ -54,15 +58,16 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> anyhow: ncr_options: ncr_options.clone(), } .into(), - ) { - CommandSource { - client, - message, - state: state.clone(), - ncr_options, - } - .reply(&format!("{error:?}")); + ) + && error.type_ != DispatcherUnknownCommand + { + CommandSource { + client, + message, + state: state.clone(), + ncr_options, } + .reply(&format!("{error:?}")); } }