From 3bb7b59ea7085a123bbf9f831c1526141f6f720a Mon Sep 17 00:00:00 2001
From: Melledy <121644117+Melledy@users.noreply.github.com>
Date: Thu, 5 Oct 2023 03:12:25 -0700
Subject: [PATCH] Random refactors in `Inventory`

---
 .../java/emu/lunarcore/commands/PlayerCommands.java   |  2 +-
 .../java/emu/lunarcore/game/inventory/Inventory.java  | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/emu/lunarcore/commands/PlayerCommands.java b/src/main/java/emu/lunarcore/commands/PlayerCommands.java
index 119c70d..97c54be 100644
--- a/src/main/java/emu/lunarcore/commands/PlayerCommands.java
+++ b/src/main/java/emu/lunarcore/commands/PlayerCommands.java
@@ -117,7 +117,7 @@ public class PlayerCommands {
             }
 
             if (itemData.isEquippable()) {
-                List<GameItem> items = new LinkedList<>();
+               //List<GameItem> items = new LinkedList<>();
                 for (int i = 0; i < count; i++) {
                     item = new GameItem(itemData);
                     //items.add(item);
diff --git a/src/main/java/emu/lunarcore/game/inventory/Inventory.java b/src/main/java/emu/lunarcore/game/inventory/Inventory.java
index cae0dab..b04eda4 100644
--- a/src/main/java/emu/lunarcore/game/inventory/Inventory.java
+++ b/src/main/java/emu/lunarcore/game/inventory/Inventory.java
@@ -102,7 +102,7 @@ public class Inventory extends BasePlayerManager {
         GameItem result = putItem(item);
 
         if (result != null) {
-            // TODO Send packet (update)
+            // Send packet (update)
             getPlayer().sendPacket(new PacketPlayerSyncScNotify(item));
             return true;
         }
@@ -129,7 +129,7 @@ public class Inventory extends BasePlayerManager {
                 return null;
             }
             // Duplicates cause problems
-            item.setCount(Math.max(item.getCount(), 1));
+            item.setCount(1);
             // Adds to inventory
             this.putItem(item, tab);
             // Set ownership and save to database
@@ -164,6 +164,9 @@ public class Inventory extends BasePlayerManager {
                     if (tab.getSize() >= tab.getMaxCapacity()) {
                         return null;
                     }
+                    // Make sure item count doesnt exceed stack limit
+                    item.setCount(Math.min(item.getCount(), item.getExcel().getPileLimit()));
+                    // Put item to inventory
                     this.putItem(item, tab);
                     // Set ownership and save to db
                     item.save();
@@ -263,10 +266,10 @@ public class Inventory extends BasePlayerManager {
             }
             // Remove from inventory if less than 0
             deleteItem(item, tab);
-            // TODO Send packet (delete)
+            // Send packet (delete)
             getPlayer().sendPacket(new PacketPlayerSyncScNotify(item));
         } else {
-            // TODO Send packet (update)
+            // Send packet (update)
             getPlayer().sendPacket(new PacketPlayerSyncScNotify(item));
         }