Merge branch 'main' into alcohol

Qbox-project · Feb 22, 2024 · cb754ee · cb754ee
2 parents 2e24cb8 + 28c2bde
commit cb754ee
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -0,0 +1,8 @@
+{
+    "recommendations": [
+        "sumneko.lua",
+        "overextended.cfxlua-vscode",
+        "ihyajb.qbcore-code-snippets",
+        "EditorConfig.EditorConfig",
+    ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,7 +1,11 @@
 {
+    "Lua.runtime.nonstandardSymbol": ["/**/", "`", "+=", "-=", "*=", "/="],
+    "Lua.runtime.version": "Lua 5.4",
     "Lua.diagnostics.globals": [
-        "cache",
         "lib",
-        "QBX"
+        "cache",
+        "QBX",
+        "locale",
+        "qbx"
     ]
-}
+}
diff --git a/server/consumables.lua b/server/consumables.lua
@@ -12,7 +12,7 @@ for drink, params in pairs(sharedConfig.consumables.drink) do
         local sustenance = player.PlayerData.metadata.thirst + math.random(params.min, params.max)
         player.Functions.SetMetaData('thirst', sustenance)
 
-        TriggerClientEvent('hud:client:UpdateNeeds', source, player.PlayerData.metadata.thirst, sustenance)
+        TriggerClientEvent('hud:client:UpdateNeeds', source, player.PlayerData.metadata.hunger, sustenance)
     end)
 end
 
@@ -28,7 +28,7 @@ for food, params in pairs(sharedConfig.consumables.food) do
         local sustenance = player.PlayerData.metadata.hunger + math.random(params.min, params.max)
         player.Functions.SetMetaData('hunger', sustenance)
 
-        TriggerClientEvent('hud:client:UpdateNeeds', source, player.PlayerData.metadata.hunger, sustenance)
+        TriggerClientEvent('hud:client:UpdateNeeds', source, sustenance, player.PlayerData.metadata.thirst)
     end)
 end