Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop

2026-01-14 14:08:26 +07:00
parent 614ba545b0 e2b4ff4dec
commit 791c918cdb
1 changed files with 5 additions and 0 deletions
@@ -1997,6 +1997,11 @@ namespace BrewMonster

                    // Add item to inventory
                    var task_ivt = GetInventory((byte)iPack);
+                    if (!task_ivt.MergeItem(idItem, iExpireDate, iAmount, out var iLastSlot, out var iSlotNum) ||
+                        iLastSlot != iCmdLastSlot || iSlotNum != iCmdSlotAmount)
+                    {
+                        return;
+                    }
                    task_ivt.SetItem(iCmdLastSlot, taskNewItem);

                    //Debug.Log($"[Inventory] Successfully added item {tid} to package {byPackage}, slot {bySlot} with count {iAmount}");