From f1d1346f3f0bb71e3017d9174598b48029b8be85 Mon Sep 17 00:00:00 2001
From: Andyyy7666 <86536434+Andyyy7666@users.noreply.github.com>
Date: Wed, 12 Jul 2023 04:51:50 +0200
Subject: [PATCH] fix: convar errors on client

---
 client/main.lua | 16 ++++++++++++++++
 init.lua        | 18 ------------------
 server/main.lua | 18 ++++++++++++++++++
 3 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/client/main.lua b/client/main.lua
index 2d6ccf0..506de6a 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -1,5 +1,21 @@
 NDCore = {}
 
+Config = {
+    serverName = GetConvar("core:serverName", "Unconfigured ND-Core Server"),
+    discordInvite = GetConvar("core:discordInvite", "https://discord.gg/Z9Mxu72zZ6"),
+    discordAppId = GetConvar("core:discordAppId", "858146067018416128"),
+    discordAsset = GetConvar("core:discordAsset", "andyyy"),
+    discordAssetSmall = GetConvar("core:discordAssetSmall", "andyyy"),
+    discordActionText = GetConvar("core:discordActionText", "DISCORD"),
+    discordActionLink = GetConvar("discordActionLink", "https://discord.gg/Z9Mxu72zZ6"),
+    discordActionText2 = GetConvar("core:discordActionText2", "STORE"),
+    discordActionLink2 = GetConvar("core:discordActionLink2", "https://andyyy.tebex.io/category/fivem-scripts"),
+    randomUnlockedVehicleChance = GetConvarInt("core:randomUnlockedVehicleChance", 30),
+    disableVehicleAirControl = GetConvarInt("core:disableVehicleAirControl", 1) == 1,
+    useInventoryForKeys = GetConvarInt("core:useInventoryForKeys", 1) == 1,
+    groups = json.decode(GetConvar("core:groups", "[]"))
+}
+
 CreateThread(function()
     SetDiscordAppId(Config.discordAppId)
     SetDiscordRichPresenceAsset(Config.discordAsset)
diff --git a/init.lua b/init.lua
index 6ad0633..499944f 100644
--- a/init.lua
+++ b/init.lua
@@ -1,21 +1,3 @@
-Config = {
-    serverName = GetConvar("core:serverName", "Unconfigured ND-Core Server"),
-    discordInvite = GetConvar("core:discordInvite", "https://discord.gg/Z9Mxu72zZ6"),
-    discordAppId = GetConvar("core:discordAppId", "858146067018416128"),
-    discordAsset = GetConvar("core:discordAsset", "andyyy"),
-    discordAssetSmall = GetConvar("core:discordAssetSmall", "andyyy"),
-    discordActionText = GetConvar("core:discordActionText", "DISCORD"),
-    discordActionLink = GetConvar("discordActionLink", "https://discord.gg/Z9Mxu72zZ6"),
-    discordActionText2 = GetConvar("core:discordActionText2", "STORE"),
-    discordActionLink2 = GetConvar("core:discordActionLink2", "https://andyyy.tebex.io/category/fivem-scripts"),
-    groups = json.decode(GetConvar("core:groups")) or {},
-    characterIdentifier = GetConvar("core:characterIdentifier", "license"),
-    randomUnlockedVehicleChance = GetConvarInt("core:randomUnlockedVehicleChance", 30),
-    disableVehicleAirControl = GetConvarInt("core:disableVehicleAirControl", 1) == 1,
-    discordGuildId = GetConvar("core:discordGuildId"),
-    discordBotToken = GetConvar("core:discordBotToken")
-}
-
 local nd_core = exports["ND_Core"]
 
 NDCore = setmetatable({}, {
diff --git a/server/main.lua b/server/main.lua
index ab94421..d108d2c 100644
--- a/server/main.lua
+++ b/server/main.lua
@@ -13,6 +13,24 @@ AddEventHandler("playerDropped", function()
     if not char then return end
     char:unload()
 end)
+Config = {
+    serverName = GetConvar("core:serverName", "Unconfigured ND-Core Server"),
+    discordInvite = GetConvar("core:discordInvite", "https://discord.gg/Z9Mxu72zZ6"),
+    discordAppId = GetConvar("core:discordAppId", "858146067018416128"),
+    discordAsset = GetConvar("core:discordAsset", "andyyy"),
+    discordAssetSmall = GetConvar("core:discordAssetSmall", "andyyy"),
+    discordActionText = GetConvar("core:discordActionText", "DISCORD"),
+    discordActionLink = GetConvar("discordActionLink", "https://discord.gg/Z9Mxu72zZ6"),
+    discordActionText2 = GetConvar("core:discordActionText2", "STORE"),
+    discordActionLink2 = GetConvar("core:discordActionLink2", "https://andyyy.tebex.io/category/fivem-scripts"),
+    characterIdentifier = GetConvar("core:characterIdentifier", "license"),
+    discordGuildId = GetConvar("core:discordGuildId"),
+    discordBotToken = GetConvar("core:discordBotToken"),
+    randomUnlockedVehicleChance = GetConvarInt("core:randomUnlockedVehicleChance", 30),
+    disableVehicleAirControl = GetConvarInt("core:disableVehicleAirControl", 1) == 1,
+    useInventoryForKeys = GetConvarInt("core:useInventoryForKeys", 1) == 1,
+    groups = json.decode(GetConvar("core:groups", "[]"))
+}
 
 SetConvarServerInfo("ND_Core", GetResourceMetadata(GetCurrentResourceName(), "version", 0) or "invalid")
 SetConvarReplicated("inventory:framework", "nd")