diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..18f7a56 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ + +ND_Blackjack/ +ND_Blips/ \ No newline at end of file diff --git a/ND_ATMs/fxmanifest.lua b/ND_ATMs/fxmanifest.lua index 18ff346..c446f43 100644 --- a/ND_ATMs/fxmanifest.lua +++ b/ND_ATMs/fxmanifest.lua @@ -1,6 +1,6 @@ -- For support join my discord: https://discord.gg/Z9Mxu72zZ6 -author "Andyyy#7666" +author "Andyyy#7666, N1K0#0001" description "ND Framework ATMs" version "2.1.0" diff --git a/ND_Banks/fxmanifest.lua b/ND_Banks/fxmanifest.lua index af39d83..27118dc 100644 --- a/ND_Banks/fxmanifest.lua +++ b/ND_Banks/fxmanifest.lua @@ -1,6 +1,6 @@ -- For support join my discord: https://discord.gg/Z9Mxu72zZ6 -author "Andyyy#7666" +author "Andyyy#7666, N1K0#0001" description "ND Framework Banks" version "2.1.0" diff --git a/ND_CharacterSelection/fxmanifest.lua b/ND_CharacterSelection/fxmanifest.lua index b177da9..87c710e 100644 --- a/ND_CharacterSelection/fxmanifest.lua +++ b/ND_CharacterSelection/fxmanifest.lua @@ -1,6 +1,6 @@ -- For support join my discord: https://discord.gg/Z9Mxu72zZ6 -author "Andyyy#7666" +author "Andyyy#7666, N1K0#0001" description "ND Character Selection (DOJ Based)" version "2.1.0" diff --git a/ND_CharacterSelection/source/client.lua b/ND_CharacterSelection/source/client.lua index 23a50a5..b838598 100644 --- a/ND_CharacterSelection/source/client.lua +++ b/ND_CharacterSelection/source/client.lua @@ -76,9 +76,13 @@ end) -- Gets all the characters and displays them on the ui. RegisterNetEvent("ND:returnCharacters") AddEventHandler("ND:returnCharacters", function(characters) + local playerCharacters = {} + for id, characterInfo in pairs(characters) do + playerCharacters[tostring(id)] = characterInfo + end SendNUIMessage({ type = "refresh", - characters = json.encode(characters) + characters = json.encode(playerCharacters) }) SetDisplay(true, "ui", background, characters) end) diff --git a/ND_Chat/fxmanifest.lua b/ND_Chat/fxmanifest.lua index 5d7cd71..53ad49c 100644 --- a/ND_Chat/fxmanifest.lua +++ b/ND_Chat/fxmanifest.lua @@ -1,5 +1,5 @@ -- For support join my discord: https://discord.gg/Z9Mxu72zZ6 -author "Andyyy#7666" +author "Andyyy#7666, N1K0#0001" description "ND Chat commands" version "2.1.0" diff --git a/ND_Core/config_server.lua b/ND_Core/config_server.lua index 66cbdfb..f252796 100644 --- a/ND_Core/config_server.lua +++ b/ND_Core/config_server.lua @@ -3,4 +3,4 @@ server_config = { discordServerToken = "OTAwODg1MDMxMDQ2Nzc0ODQ1.GU1TSC.Ed8D2_wcU-UQ1vZhe1khahgV8J3hLahOp4N1D8", -- discord bot token for permissions guildId = "872496972454592523", -- discord guild id -} \ No newline at end of file +} diff --git a/ND_Core/fxmanifest.lua b/ND_Core/fxmanifest.lua index ba103f8..67d7f58 100644 --- a/ND_Core/fxmanifest.lua +++ b/ND_Core/fxmanifest.lua @@ -1,8 +1,8 @@ -- For support join my discord: https://discord.gg/Z9Mxu72zZ6 -author "Andyyy#7666" +author "Andyyy#7666, N1K0#0001" description "ND Framework Core" -version "3.0.0" +version "3.0.1" fx_version "cerulean" game "gta5" diff --git a/ND_Core/server/events.lua b/ND_Core/server/events.lua index c6264cf..202db9e 100644 --- a/ND_Core/server/events.lua +++ b/ND_Core/server/events.lua @@ -41,6 +41,7 @@ end) -- Getting all the characters the player has and returning them to the client. RegisterNetEvent("ND:GetCharacters", function() local player = source + print(NDCore.Functions.GetPlayerCharacters(player)[1]) TriggerClientEvent("ND:returnCharacters", player, NDCore.Functions.GetPlayerCharacters(player)) end) diff --git a/ND_Doorlocks/fxmanifest.lua b/ND_Doorlocks/fxmanifest.lua index 3e7bc31..82c57fb 100644 --- a/ND_Doorlocks/fxmanifest.lua +++ b/ND_Doorlocks/fxmanifest.lua @@ -1,6 +1,6 @@ -- For support join my discord: https://discord.gg/Z9Mxu72zZ6 -author "Andyyy#7666" +author "Andyyy#7666, N1K0#0001" description "ND Framework Doorlocks for buildings" version "2.1.0" diff --git a/ND_Jailing/fxmanifest.lua b/ND_Jailing/fxmanifest.lua index ca54abb..8005cdc 100644 --- a/ND_Jailing/fxmanifest.lua +++ b/ND_Jailing/fxmanifest.lua @@ -1,6 +1,6 @@ -- For support join my discord: https://discord.gg/Z9Mxu72zZ6 -author "Andyyy#7666" +author "Andyyy#7666, N1K0#0001" description "ND Framework Jailing" version "2.2.0" diff --git a/ND_ShotSpotter/fxmanifest.lua b/ND_ShotSpotter/fxmanifest.lua index 26fe7fd..6194898 100644 --- a/ND_ShotSpotter/fxmanifest.lua +++ b/ND_ShotSpotter/fxmanifest.lua @@ -1,6 +1,6 @@ -- For support join my discord: https://discord.gg/Z9Mxu72zZ6 -author "Andyyy#7666" +author "Andyyy#7666, N1K0#0001" description "Shot Spotter Script (ND Framework)" version "2.1.0"