diff --git a/pumpkin-inventory/src/drag_handler.rs b/pumpkin-inventory/src/drag_handler.rs index 8ac7198fc..aefb96cac 100644 --- a/pumpkin-inventory/src/drag_handler.rs +++ b/pumpkin-inventory/src/drag_handler.rs @@ -4,9 +4,7 @@ use itertools::Itertools; use num_traits::Euclid; use pumpkin_world::item::ItemStack; use std::collections::HashMap; -use std::iter::{Enumerate, Filter, TakeWhile}; use std::sync::{Arc, Mutex, RwLock}; -use std::vec::IntoIter; #[derive(Debug, Default)] pub struct DragHandler(RwLock>>>); @@ -76,7 +74,7 @@ impl DragHandler { let Some((_, drag)) = drags.remove_entry(container_id) else { Err(InventoryError::OutOfOrderDragging)? }; - let mut drag = drag.lock().unwrap(); + let drag = drag.lock().unwrap(); if player != drag.player { Err(InventoryError::MultiplePlayersDragging)? diff --git a/pumpkin-inventory/src/lib.rs b/pumpkin-inventory/src/lib.rs index e90884da8..738262c92 100644 --- a/pumpkin-inventory/src/lib.rs +++ b/pumpkin-inventory/src/lib.rs @@ -1,4 +1,4 @@ -use crate::container_click::{MouseClick, MouseDragState, MouseDragType}; +use crate::container_click::MouseClick; use crate::player::PlayerInventory; use num_derive::{FromPrimitive, ToPrimitive}; use pumpkin_world::item::ItemStack; diff --git a/pumpkin-inventory/src/open_container.rs b/pumpkin-inventory/src/open_container.rs index 3789575c7..87a9e52fa 100644 --- a/pumpkin-inventory/src/open_container.rs +++ b/pumpkin-inventory/src/open_container.rs @@ -1,7 +1,6 @@ -use crate::drag_handler::DragHandler; use crate::{Container, WindowType}; use pumpkin_world::item::ItemStack; -use std::sync::{Arc, Mutex}; +use std::sync::Mutex; pub struct OpenContainer { players: Vec, diff --git a/pumpkin-inventory/src/player.rs b/pumpkin-inventory/src/player.rs index 96e7a8907..e37cbd9bb 100644 --- a/pumpkin-inventory/src/player.rs +++ b/pumpkin-inventory/src/player.rs @@ -1,5 +1,4 @@ use crate::container_click::MouseClick; -use crate::drag_handler::DragHandler; use crate::{handle_item_change, Container, InventoryError, WindowType}; use pumpkin_world::item::ItemStack; diff --git a/pumpkin/src/client/container.rs b/pumpkin/src/client/container.rs index d34fa9982..a51383ced 100644 --- a/pumpkin/src/client/container.rs +++ b/pumpkin/src/client/container.rs @@ -3,7 +3,7 @@ use crate::server::Server; use itertools::Itertools; use pumpkin_core::text::TextComponent; use pumpkin_core::GameMode; -use pumpkin_inventory::container_click::{KeyClick, MouseClick, MouseDragState, MouseDragType}; +use pumpkin_inventory::container_click::{KeyClick, MouseClick, MouseDragState}; use pumpkin_inventory::drag_handler::DragHandler; use pumpkin_inventory::window_property::{WindowProperty, WindowPropertyTrait}; use pumpkin_inventory::{container_click, InventoryError, OptionallyCombinedContainer}; @@ -14,7 +14,7 @@ use pumpkin_protocol::client::play::{ use pumpkin_protocol::server::play::SClickContainer; use pumpkin_protocol::slot::Slot; use pumpkin_world::item::ItemStack; -use std::sync::{Arc, Mutex, MutexGuard}; +use std::sync::Mutex; impl Player { pub fn open_container( diff --git a/pumpkin/src/entity/player.rs b/pumpkin/src/entity/player.rs index d2e1afe4d..617eb8e03 100644 --- a/pumpkin/src/entity/player.rs +++ b/pumpkin/src/entity/player.rs @@ -452,7 +452,8 @@ impl Player { Ok(()) } SClickContainer::PACKET_ID => { - self.handle_click_container(server, SClickContainer::read(bytebuf)?); + self.handle_click_container(server, SClickContainer::read(bytebuf)?) + .unwrap(); Ok(()) } SCloseContainer::PACKET_ID => { diff --git a/pumpkin/src/server.rs b/pumpkin/src/server.rs index d36f05a47..4d908919e 100644 --- a/pumpkin/src/server.rs +++ b/pumpkin/src/server.rs @@ -16,7 +16,7 @@ use std::{ path::Path, sync::{ atomic::{AtomicI32, Ordering}, - Arc, Mutex, MutexGuard, + Arc, Mutex, }, time::Duration, };