From 602c1c0859520eb50f8ba89c3b018e9bf2dd5e33 Mon Sep 17 00:00:00 2001
From: Edvin Bryntesson <epost@edvinbryntesson.se>
Date: Thu, 5 Sep 2024 16:46:30 +0200
Subject: [PATCH] clippy + format

---
 pumpkin-inventory/src/drag_handler.rs | 12 ++++++------
 pumpkin-inventory/src/lib.rs          |  2 +-
 pumpkin/src/client/container.rs       |  1 -
 pumpkin/src/server/mod.rs             |  5 +----
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pumpkin-inventory/src/drag_handler.rs b/pumpkin-inventory/src/drag_handler.rs
index aefb96cac..c34d423a8 100644
--- a/pumpkin-inventory/src/drag_handler.rs
+++ b/pumpkin-inventory/src/drag_handler.rs
@@ -89,12 +89,12 @@ impl DragHandler {
             // Checked in any function that uses this function.
             MouseDragType::Middle => {
                 for slot in &drag.slots {
-                    *slots[*slot] = carried_item.clone();
+                    *slots[*slot] = *carried_item;
                 }
             }
             MouseDragType::Right => {
                 let amount_of_items = carried_item.unwrap().item_count as usize;
-                let mut single_item = carried_item.clone().unwrap();
+                let mut single_item = carried_item.unwrap();
                 single_item.item_count = 1;
                 let changing_slots = drag.changing_slots(
                     amount_of_items,
@@ -104,7 +104,7 @@ impl DragHandler {
                 let mut amount_removed = 0;
                 changing_slots.for_each(|slot| {
                     amount_removed += 1;
-                    *slots[slot] = Some(single_item.clone())
+                    *slots[slot] = Some(single_item)
                 });
 
                 let mut remaining = carried_item.unwrap();
@@ -128,12 +128,12 @@ impl DragHandler {
                 let amount_of_slots = changing_slots.clone().count();
                 let (amount_per_slot, remainder) =
                     (carried_item.unwrap().item_count as usize).div_rem_euclid(&amount_of_slots);
-                let mut item_in_each_slot = carried_item.unwrap().clone();
+                let mut item_in_each_slot = carried_item.unwrap();
                 item_in_each_slot.item_count = amount_per_slot as u8;
-                changing_slots.for_each(|slot| *slots[slot] = Some(item_in_each_slot.clone()));
+                changing_slots.for_each(|slot| *slots[slot] = Some(item_in_each_slot));
 
                 if remainder > 0 {
-                    let mut remaining = carried_item.unwrap().clone();
+                    let mut remaining = carried_item.unwrap();
                     remaining.item_count = remainder as u8;
                     *carried_item = Some(remaining)
                 } else {
diff --git a/pumpkin-inventory/src/lib.rs b/pumpkin-inventory/src/lib.rs
index ac818851f..dbbc4b0a1 100644
--- a/pumpkin-inventory/src/lib.rs
+++ b/pumpkin-inventory/src/lib.rs
@@ -73,7 +73,7 @@ pub trait Container: Sync + Send {
         mouse_click: MouseClick,
     ) -> Result<(), InventoryError> {
         let mut all_slots = self.all_slots();
-        if slot > all_slots.len() || slot < 0 {
+        if slot > all_slots.len() {
             Err(InventoryError::InvalidSlot)?
         }
         handle_item_change(carried_item, all_slots[slot], mouse_click);
diff --git a/pumpkin/src/client/container.rs b/pumpkin/src/client/container.rs
index 96f071b5f..6b8da77d8 100644
--- a/pumpkin/src/client/container.rs
+++ b/pumpkin/src/client/container.rs
@@ -142,7 +142,6 @@ impl Player {
             packet.slot,
         );
 
-        let slot = click.slot.clone();
         match click.click_type {
             ClickType::MouseClick(mouse_click) => {
                 self.mouse_click(opened_container, mouse_click, click.slot)
diff --git a/pumpkin/src/server/mod.rs b/pumpkin/src/server/mod.rs
index d540dd40e..8be4c6175 100644
--- a/pumpkin/src/server/mod.rs
+++ b/pumpkin/src/server/mod.rs
@@ -138,10 +138,7 @@ impl Server {
         player_id: EntityId,
         container_id: u64,
     ) -> Option<&Mutex<Box<dyn Container>>> {
-        self.open_containers
-            .get(&container_id)?
-            .try_open(player_id)
-            .map(|container| container)
+        self.open_containers.get(&container_id)?.try_open(player_id)
     }
 
     /// Sends a Packet to all Players in all worlds