Pumpkin-MC/Pumpkin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix CI

Browse Source
This commit is contained in:
Edvin Bryntesson 2024-10-14 11:26:51 +02:00
parent dfd4f9bc76
commit 01163d155d
No known key found for this signature in database
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pumpkin/src/entity/player.rs
View File

@ -40,7 +40,7 @@ use crate::{
world::World, world::World,
}; };
use super::{living::LivingEntity, Entity}; use super::living::LivingEntity;
/// Represents a Minecraft player entity. /// Represents a Minecraft player entity.
/// ///
@ -382,6 +382,7 @@ impl Player {
} }
SClickContainer::PACKET_ID => { SClickContainer::PACKET_ID => {
self.handle_click_container(server, SClickContainer::read(bytebuf)?) self.handle_click_container(server, SClickContainer::read(bytebuf)?)
.await?;
Ok(()) Ok(())
} }
SCloseContainer::PACKET_ID => { SCloseContainer::PACKET_ID => {

25
pumpkin/src/error.rs
View File

@ -22,25 +22,22 @@ impl<ErrorType: PumpkinError + 'static> From<ErrorType> for Box<dyn PumpkinError
} }
impl PumpkinError for InventoryError { impl PumpkinError for InventoryError {
fn is_kick(&self) -> bool { fn is_kick(&self) -> bool {
use InventoryError::*;
match self { match self {
InventoryError::InvalidSlot InvalidSlot | ClosedContainerInteract(..) | InvalidPacket | PermissionError => true,
| InventoryError::ClosedContainerInteract(..) LockError | OutOfOrderDragging | MultiplePlayersDragging => false,
| InventoryError::InvalidPacket
| InventoryError::PermissionError => true,
InventoryError::LockError
| InventoryError::OutOfOrderDragging
| InventoryError::MultiplePlayersDragging => false,
} }
} }
fn severity(&self) -> log::Level { fn severity(&self) -> log::Level {
use InventoryError::*;
match self { match self {
InventoryError::LockError LockError
| InventoryError::InvalidSlot | InvalidSlot
| InventoryError::ClosedContainerInteract(..) | ClosedContainerInteract(..)
| InventoryError::InvalidPacket | InvalidPacket
| InventoryError::PermissionError => log::Level::Error, | PermissionError => log::Level::Error,
InventoryError::OutOfOrderDragging => log::Level::Info, OutOfOrderDragging => log::Level::Info,
InventoryError::MultiplePlayersDragging => log::Level::Warn, MultiplePlayersDragging => log::Level::Warn,
} }
} }