Fix Drop All Item

ElclarkKuhu · Sep 30, 2021 · 4920c74 · 4920c74
1 parent 38a3e11
commit 4920c74
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/NUI/script.js b/NUI/script.js
@@ -124,7 +124,7 @@ function createItem(obj, append) {
                     'slot' : obj.slot,
                     'all' : true
                 }));
-                data.filter(i => obj.name != i.name && obj.slot === i.slot)
+                data = data.filter(i => obj.name != i.name && obj.slot === i.slot)
             } else {
                 $.post(`https://${GetParentResourceName()}/dropItem`, JSON.stringify({
                     'id' : event.currentTarget.id,
@@ -205,6 +205,7 @@ function updateData(container, draggable, shiftKey) {
                     data[i].slot = container.id
                 }
             })
+
             $.post(`https://${GetParentResourceName()}/moveSlot`, JSON.stringify({
                 'mode': 'move',
                 'all': true,
@@ -215,6 +216,7 @@ function updateData(container, draggable, shiftKey) {
             }));
         } else {
             data[index].slot = container.id
+
             $.post(`https://${GetParentResourceName()}/moveSlot`, JSON.stringify({
                 'mode': 'move',
                 'all': false,

diff --git a/fxmanifest.lua b/fxmanifest.lua
@@ -1,7 +1,7 @@
 fx_version 'cerulean'
 
 author 'Elclark'
-version '1.0.0'
+version '1.0.1'
 description 'Elclark Inventory Lite. Is an simple ESX Inventory with drag and drop and splittable items to organize your items and weapons'
 
 game 'gta5'

diff --git a/server/main.lua b/server/main.lua
@@ -173,23 +173,20 @@ RegisterNetEvent('eInventoryLite:dropItem', function(item)
     for key, value in pairs(data[identifier]) do
         if item.id == value.id then
             if value.type == 'item_standard' then
-                local InventoryItem = xPlayer.getInventoryItem(value.name)
-                local count = 1
-                if item.all then
-                    count = 0
-                    for k, v in pairs(data[identifier]) do
-                        if v.name == value.name and v.slot == value.slot then
-                            count = count + 1
-                        end
+                local inventoryItem = xPlayer.getInventoryItem(value.name)
+                if inventoryItem.count > 0 then
+                    local count = 1
+                    if item.all then
+                        count = inventoryItem.count
                     end
+                    ESX.CreatePickup(value.type, inventoryItem.name, count, inventoryItem.label, source)
+                    xPlayer.removeInventoryItem(inventoryItem.name, count)
                 end
-                ESX.CreatePickup(value.type, InventoryItem.name, count, InventoryItem.label, source)
-                xPlayer.removeInventoryItem(value.name, count)
             else
                 local loadoutNum, weapon = xPlayer.getWeapon(value.name)
                 if weapon then
-                    ESX.CreatePickup(value.type, value.name, weapon.ammo, weapon.label, source, weapon.components, weapon.tintIndex)
-                    xPlayer.removeWeapon(value.name)
+                    ESX.CreatePickup(value.type, weapon.name, weapon.ammo, weapon.label, source, weapon.components, weapon.tintIndex)
+                    xPlayer.removeWeapon(weapon.name)
                 end
             end