Merge pull request #568 from adhershmnair/main

Fixed swapping in same inventory checking total weight.
qbcore-framework · Oct 17, 2024 · ee02bf4 · ee02bf4
2 parents 19197a2 + eb5eab4
commit ee02bf4
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/html/app.js b/html/app.js
@@ -447,21 +447,21 @@ const InventoryContainer = Vue.createApp({
                 if (sourceItem.amount < amountToTransfer) {
                     throw new Error("Insufficient amount of item in source inventory");
                 }
-                
-                if (targetInventoryType == "other")
-                    {
+
+                if (targetInventoryType !== this.dragStartInventoryType) {
+                    if (targetInventoryType == "other") {
                         const totalWeightAfterTransfer = this.otherInventoryWeight + sourceItem.weight * amountToTransfer;
                         if (totalWeightAfterTransfer > this.otherInventoryMaxWeight) {
                             throw new Error("Insufficient weight capacity in target inventory");
                         }
                     }
-                else if (targetInventoryType == "player")
-                    {
+                    else if (targetInventoryType == "player") {
                         const totalWeightAfterTransfer = this.playerWeight + sourceItem.weight * amountToTransfer;
                         if (totalWeightAfterTransfer > this.maxWeight) {
                             throw new Error("Insufficient weight capacity in player inventory");
                         }
                     }
+                }
 
                 const targetItem = targetInventory[targetSlotNumber];