From f51d8cb281aa158b3bc544efc036b62d453c38c3 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sat, 4 Jan 2020 15:16:16 +0100 Subject: [PATCH 1/7] Updated SQL to weight --- esx_basicneeds.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esx_basicneeds.sql b/esx_basicneeds.sql index 02d24aa6..d7c94296 100644 --- a/esx_basicneeds.sql +++ b/esx_basicneeds.sql @@ -1,6 +1,6 @@ USE `essentialmode`; -INSERT INTO `items` (`name`, `label`, `limit`) VALUES +INSERT INTO `items` (`name`, `label`, `weight`) VALUES ('bread', 'Pain', 10), ('water', 'Eau', 5) -; \ No newline at end of file +; From 79762b6b44b054d30a733f24d007b4f650559550 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Mon, 6 Jan 2020 15:51:35 +0100 Subject: [PATCH 2/7] Updated SQL --- esx_basicneeds.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esx_basicneeds.sql b/esx_basicneeds.sql index d7c94296..2bf6df1f 100644 --- a/esx_basicneeds.sql +++ b/esx_basicneeds.sql @@ -1,6 +1,6 @@ USE `essentialmode`; INSERT INTO `items` (`name`, `label`, `weight`) VALUES - ('bread', 'Pain', 10), - ('water', 'Eau', 5) + ('bread', 'Pain', 1), + ('water', 'Eau', 1) ; From 208a362a5c68cc98787a1ae5abe771d7945165db Mon Sep 17 00:00:00 2001 From: rex2630 Date: Mon, 6 Jan 2020 15:52:04 +0100 Subject: [PATCH 3/7] SQL weight --- localization/de_esx_basicneeds.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/localization/de_esx_basicneeds.sql b/localization/de_esx_basicneeds.sql index 0e097e34..6dcf8319 100644 --- a/localization/de_esx_basicneeds.sql +++ b/localization/de_esx_basicneeds.sql @@ -1,6 +1,6 @@ USE `essentialmode`; -INSERT INTO `items` (`name`, `label`, `limit`) VALUES - ('bread', 'Brot', 10), - ('water', 'Wasser', 5) -; \ No newline at end of file +INSERT INTO `items` (`name`, `label`, `weight`) VALUES + ('bread', 'Brot', 1), + ('water', 'Wasser', 1) +; From 68e2fc52bf8f7a2f0a370b914ca35fe30b241837 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Mon, 6 Jan 2020 15:52:24 +0100 Subject: [PATCH 4/7] SQL weight --- localization/fi_esx_basicneeds.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/localization/fi_esx_basicneeds.sql b/localization/fi_esx_basicneeds.sql index 222cd54b..96a7a19d 100644 --- a/localization/fi_esx_basicneeds.sql +++ b/localization/fi_esx_basicneeds.sql @@ -1,6 +1,6 @@ USE `essentialmode`; -INSERT INTO `items` (`name`, `label`, `limit`) VALUES - ('bread', 'Leipä', 10), - ('water', 'Vesi', 5) -; \ No newline at end of file +INSERT INTO `items` (`name`, `label`, `weight`) VALUES + ('bread', 'Leipä', 1), + ('water', 'Vesi', 1) +; From bde5d69c1a303e2a1ff5eca9533bb374b7ce7283 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Mon, 6 Jan 2020 15:52:45 +0100 Subject: [PATCH 5/7] SQL weight --- localization/pl_esx_basicneeds.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/localization/pl_esx_basicneeds.sql b/localization/pl_esx_basicneeds.sql index dab8eeb7..3510f9cd 100644 --- a/localization/pl_esx_basicneeds.sql +++ b/localization/pl_esx_basicneeds.sql @@ -1,6 +1,6 @@ USE `essentialmode`; -INSERT INTO `items` (`name`, `label`, `limit`) VALUES - ('bread', 'Chleb', 10), - ('water', 'Woda', 5) -; \ No newline at end of file +INSERT INTO `items` (`name`, `label`, `weight`) VALUES + ('bread', 'Chleb', 1), + ('water', 'Woda', 1) +; From 37474d5d755b32cab395f6c3de876bc7c1f8bfd5 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Mon, 6 Jan 2020 15:53:05 +0100 Subject: [PATCH 6/7] SQL weight --- localization/sv_esx_basicneeds.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/localization/sv_esx_basicneeds.sql b/localization/sv_esx_basicneeds.sql index a22ab46b..be91ddc8 100644 --- a/localization/sv_esx_basicneeds.sql +++ b/localization/sv_esx_basicneeds.sql @@ -1,6 +1,6 @@ USE `essentialmode`; -INSERT INTO `items` (`name`, `label`, `limit`) VALUES - ('bread', 'Bröd', 10), - ('water', 'Vatten', 5) -; \ No newline at end of file +INSERT INTO `items` (`name`, `label`, `weight`) VALUES + ('bread', 'Bröd', 1), + ('water', 'Vatten', 1) +; From 04d3a6162fef4666c4079a524a8fa60d8361825b Mon Sep 17 00:00:00 2001 From: rex2630 Date: Mon, 6 Jan 2020 15:56:35 +0100 Subject: [PATCH 7/7] Updated to newest ESX --- server/main.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/main.lua b/server/main.lua index 4d4b4425..bddea2ca 100644 --- a/server/main.lua +++ b/server/main.lua @@ -9,7 +9,7 @@ ESX.RegisterUsableItem('bread', function(source) TriggerClientEvent('esx_status:add', source, 'hunger', 200000) TriggerClientEvent('esx_basicneeds:onEat', source) - TriggerClientEvent('esx:showNotification', source, _U('used_bread')) + xPlayer.showNotification(_U('used_bread')) end) ESX.RegisterUsableItem('water', function(source) @@ -19,7 +19,7 @@ ESX.RegisterUsableItem('water', function(source) TriggerClientEvent('esx_status:add', source, 'thirst', 200000) TriggerClientEvent('esx_basicneeds:onDrink', source) - TriggerClientEvent('esx:showNotification', source, _U('used_water')) + xPlayer.showNotification(_U('used_water')) end) TriggerEvent('es:addGroupCommand', 'heal', 'admin', function(source, args, user) @@ -46,4 +46,4 @@ TriggerEvent('es:addGroupCommand', 'heal', 'admin', function(source, args, user) end end, function(source, args, user) TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Insufficient Permissions.' } }) -end, {help = 'Heal a player, or yourself - restores thirst, hunger and health.', params = {{name = 'playerId', help = '(optional) player id'}}}) \ No newline at end of file +end, {help = 'Heal a player, or yourself - restores thirst, hunger and health.', params = {{name = 'playerId', help = '(optional) player id'}}})