From 01163d155d34775a6b9b19c17334b56b0d5315d5 Mon Sep 17 00:00:00 2001 From: Edvin Bryntesson Date: Mon, 14 Oct 2024 11:26:51 +0200 Subject: [PATCH] fix CI --- pumpkin/src/entity/player.rs | 3 ++- pumpkin/src/error.rs | 25 +++++++++++-------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/pumpkin/src/entity/player.rs b/pumpkin/src/entity/player.rs index b824275de..5312f4c2e 100644 --- a/pumpkin/src/entity/player.rs +++ b/pumpkin/src/entity/player.rs @@ -40,7 +40,7 @@ use crate::{ world::World, }; -use super::{living::LivingEntity, Entity}; +use super::living::LivingEntity; /// Represents a Minecraft player entity. /// @@ -382,6 +382,7 @@ impl Player { } SClickContainer::PACKET_ID => { self.handle_click_container(server, SClickContainer::read(bytebuf)?) + .await?; Ok(()) } SCloseContainer::PACKET_ID => { diff --git a/pumpkin/src/error.rs b/pumpkin/src/error.rs index caf9b98a6..85cf4a34f 100644 --- a/pumpkin/src/error.rs +++ b/pumpkin/src/error.rs @@ -22,25 +22,22 @@ impl From for Box bool { + use InventoryError::*; match self { - InventoryError::InvalidSlot - | InventoryError::ClosedContainerInteract(..) - | InventoryError::InvalidPacket - | InventoryError::PermissionError => true, - InventoryError::LockError - | InventoryError::OutOfOrderDragging - | InventoryError::MultiplePlayersDragging => false, + InvalidSlot | ClosedContainerInteract(..) | InvalidPacket | PermissionError => true, + LockError | OutOfOrderDragging | MultiplePlayersDragging => false, } } fn severity(&self) -> log::Level { + use InventoryError::*; match self { - InventoryError::LockError - | InventoryError::InvalidSlot - | InventoryError::ClosedContainerInteract(..) - | InventoryError::InvalidPacket - | InventoryError::PermissionError => log::Level::Error, - InventoryError::OutOfOrderDragging => log::Level::Info, - InventoryError::MultiplePlayersDragging => log::Level::Warn, + LockError + | InvalidSlot + | ClosedContainerInteract(..) + | InvalidPacket + | PermissionError => log::Level::Error, + OutOfOrderDragging => log::Level::Info, + MultiplePlayersDragging => log::Level::Warn, } }