From 911514500a200a51dab34a463c474cb85351196d Mon Sep 17 00:00:00 2001 From: RoadToSix <92928205+roadtosixx@users.noreply.github.com> Date: Wed, 27 Jul 2022 00:51:22 +0200 Subject: [PATCH 1/5] Update fxmanifest.lua --- [esx]/esx_multicharacter/fxmanifest.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/[esx]/esx_multicharacter/fxmanifest.lua b/[esx]/esx_multicharacter/fxmanifest.lua index 7c97b301..e6d8b176 100644 --- a/[esx]/esx_multicharacter/fxmanifest.lua +++ b/[esx]/esx_multicharacter/fxmanifest.lua @@ -7,9 +7,9 @@ lua54 'yes' dependencies {'es_extended', 'esx_menu_default', 'esx_identity', 'esx_skin'} -shared_scripts {'@es_extended/locale.lua', 'locales/*.lua', 'config.lua'} +shared_scripts {'@es_extended/imports.lua', '@es_extended/locale.lua', 'locales/*.lua', 'config.lua'} -server_scripts {'@es_extended/imports.lua', '@oxmysql/lib/MySQL.lua', 'server/*.lua'} +server_scripts {'@oxmysql/lib/MySQL.lua', 'server/*.lua'} client_scripts {'client/*.lua'} From 9bf28a46ae7d492cb46e79567c4bc2937005e7c8 Mon Sep 17 00:00:00 2001 From: RoadToSix <92928205+roadtosixx@users.noreply.github.com> Date: Wed, 27 Jul 2022 00:53:16 +0200 Subject: [PATCH 2/5] Update main.lua --- [esx]/esx_multicharacter/client/main.lua | 33 ++++++++++++------------ 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/[esx]/esx_multicharacter/client/main.lua b/[esx]/esx_multicharacter/client/main.lua index a006f9e7..98c11068 100644 --- a/[esx]/esx_multicharacter/client/main.lua +++ b/[esx]/esx_multicharacter/client/main.lua @@ -1,16 +1,15 @@ -ESX = exports['es_extended']:getSharedObject() local mp_m_freemode_01 = `mp_m_freemode_01` local mp_f_freemode_01 = `mp_f_freemode_01` if ESX.GetConfig().Multichar then - Citizen.CreateThread(function() + CreateThread(function() while not ESX.PlayerLoaded do - Citizen.Wait(0) + Wait(0) if NetworkIsPlayerActive(PlayerId()) then exports.spawnmanager:setAutoSpawn(false) DoScreenFadeOut(0) while not GetResourceState('esx_menu_default') == 'started' do - Citizen.Wait(0) + Wait(0) end TriggerEvent("esx_multicharacter:SetupCharacters") break @@ -42,14 +41,14 @@ if ESX.GetConfig().Multichar then ShutdownLoadingScreen() ShutdownLoadingScreenNui() TriggerEvent('esx:loadingScreenOff') - Citizen.Wait(200) + Wait(200) TriggerServerEvent("esx_multicharacter:SetupCharacters") end) StartLoop = function() hidePlayers = true MumbleSetVolumeOverride(PlayerId(), 0.0) - Citizen.CreateThread(function() + CreateThread(function() local keys = {18, 27, 172, 173, 174, 175, 176, 177, 187, 188, 191, 201, 108, 109} while hidePlayers do DisableAllControlActions(0) @@ -64,7 +63,7 @@ if ESX.GetConfig().Multichar then HideHudComponentThisFrame(12) HideHudComponentThisFrame(21) HideHudAndRadarThisFrame() - Citizen.Wait(0) + Wait(0) local vehicles = GetGamePool('CVehicle') for i = 1, #vehicles do SetEntityLocallyInvisible(vehicles[i]) @@ -75,10 +74,10 @@ if ESX.GetConfig().Multichar then SetEntityVisible(playerPed, 1, 0) SetPlayerInvincible(playerId, 0) FreezeEntityPosition(playerPed, false) - Citizen.Wait(10000) + Wait(10000) canRelog = true end) - Citizen.CreateThread(function() + CreateThread(function() local playerPool = {} while hidePlayers do local players = GetActivePlayers() @@ -89,7 +88,7 @@ if ESX.GetConfig().Multichar then NetworkConcealPlayer(player, true, true) end end - Citizen.Wait(500) + Wait(500) end for k in pairs(playerPool) do NetworkConcealPlayer(k, false, false) @@ -117,14 +116,14 @@ if ESX.GetConfig().Multichar then end DoScreenFadeIn(400) end) - repeat Citizen.Wait(200) until not IsScreenFadedOut() + repeat Wait(200) until not IsScreenFadedOut() elseif Characters[index] and Characters[index].skin then if Characters[spawned] and Characters[spawned].model then RequestModel(Characters[index].model) while not HasModelLoaded(Characters[index].model) do RequestModel(Characters[index].model) - Citizen.Wait(0) + Wait(0) end SetPlayerModel(PlayerId(), Characters[index].model) SetModelAsNoLongerNeeded(Characters[index].model) @@ -165,7 +164,7 @@ if ESX.GetConfig().Multichar then }, function() canRelog = false DoScreenFadeIn(400) - Citizen.Wait(400) + Wait(400) local playerPed = PlayerPedId() SetPedAoBlobRendering(playerPed, false) SetEntityAlpha(playerPed, 0) @@ -278,7 +277,7 @@ if ESX.GetConfig().Multichar then RequestModel(model) while not HasModelLoaded(model) do RequestModel(model) - Citizen.Wait(0) + Wait(0) end SetPlayerModel(PlayerId(), model) SetModelAsNoLongerNeeded(model) @@ -292,7 +291,7 @@ if ESX.GetConfig().Multichar then finished = true end, function() finished = true end) end) - repeat Citizen.Wait(200) until finished + repeat Wait(200) until finished end DoScreenFadeOut(100) @@ -304,9 +303,9 @@ if ESX.GetConfig().Multichar then SetEntityCoordsNoOffset(playerPed, spawn.x, spawn.y, spawn.z, false, false, false, true) SetEntityHeading(playerPed, spawn.heading) if not isNew then TriggerEvent('skinchanger:loadSkin', skin or Characters[spawned].skin) end - Citizen.Wait(400) + Wait(400) DoScreenFadeIn(400) - repeat Citizen.Wait(200) until not IsScreenFadedOut() + repeat Wait(200) until not IsScreenFadedOut() TriggerServerEvent('esx:onPlayerSpawn') TriggerEvent('esx:onPlayerSpawn') TriggerEvent('playerSpawned') From 8744f2c10183bc0d895cbf296324a270e6b80a6f Mon Sep 17 00:00:00 2001 From: RoadToSix <92928205+roadtosixx@users.noreply.github.com> Date: Wed, 27 Jul 2022 00:54:26 +0200 Subject: [PATCH 3/5] Update main.lua --- [esx]/esx_multicharacter/server/main.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/[esx]/esx_multicharacter/server/main.lua b/[esx]/esx_multicharacter/server/main.lua index bba108cc..91e0317e 100644 --- a/[esx]/esx_multicharacter/server/main.lua +++ b/[esx]/esx_multicharacter/server/main.lua @@ -44,7 +44,7 @@ elseif ESX.GetConfig().Multichar == true then else ESX.Players = {} end local function SetupCharacters(source) - while not FETCH do Citizen.Wait(100) end + while not FETCH do Wait(100) end local identifier = GetIdentifier(source) ESX.Players[identifier] = true @@ -118,7 +118,7 @@ elseif ESX.GetConfig().Multichar == true then MySQL.transaction(queries, function(result) if result then print(('[^2INFO^7] Player [%s] %s has deleted a character (%s)'):format(GetPlayerName(source), source, identifier)) - Citizen.Wait(50) + Wait(50) SetupCharacters(source) else error('\n^1Transaction failed while trying to delete '..identifier..'^0') @@ -171,7 +171,7 @@ elseif ESX.GetConfig().Multichar == true then repeat ESX.Jobs = GetJobs() - Citizen.Wait(50) + Wait(50) until next(ESX.Jobs) FETCH = 'SELECT identifier, accounts, job, job_grade, firstname, lastname, dateofbirth, sex, skin, disabled FROM users WHERE identifier LIKE ? LIMIT ?' From 55a9c337f609054ef612ca902a2168ec5d6dbbb3 Mon Sep 17 00:00:00 2001 From: RoadToSix <92928205+roadtosixx@users.noreply.github.com> Date: Wed, 27 Jul 2022 00:55:29 +0200 Subject: [PATCH 4/5] Update commands.lua --- [esx]/esx_multicharacter/server/commands.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/[esx]/esx_multicharacter/server/commands.lua b/[esx]/esx_multicharacter/server/commands.lua index 3cfa98d5..3dc02857 100644 --- a/[esx]/esx_multicharacter/server/commands.lua +++ b/[esx]/esx_multicharacter/server/commands.lua @@ -3,7 +3,7 @@ ESX.RegisterCommand('setslots', 'admin', function(xPlayer, args, showError) args.identifier }) - if slots == nil then + if not slots then MySQL.update('INSERT INTO `multicharacter_slots` (`identifier`, `slots`) VALUES (?, ?)', { args.identifier, args.slots @@ -26,7 +26,7 @@ ESX.RegisterCommand('remslots', 'admin', function(xPlayer, args, showError) args.identifier }) - if slots ~= nil then + if slots then MySQL.update('DELETE FROM `multicharacter_slots` WHERE `identifier` = ?', { args.identifier }) From 7019650232754a81bbf717a08f04d4b6cc8ad3a5 Mon Sep 17 00:00:00 2001 From: RoadToSix <92928205+roadtosixx@users.noreply.github.com> Date: Wed, 27 Jul 2022 00:56:49 +0200 Subject: [PATCH 5/5] Update de.lua --- [esx]/esx_multicharacter/locales/de.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[esx]/esx_multicharacter/locales/de.lua b/[esx]/esx_multicharacter/locales/de.lua index 654971af..ab90e3b9 100644 --- a/[esx]/esx_multicharacter/locales/de.lua +++ b/[esx]/esx_multicharacter/locales/de.lua @@ -4,7 +4,7 @@ Locales['de'] = { ['delete_label'] = "Lösche %s %s?", ['select_char'] = "Charakter auswählen", ['create_char'] = "Neuen Charakter erstellen", - ['char_play'] = "Diesen Charakter spielen", + ['char_play'] = "Diesen Charakter auswählen", ['char_delete'] = "Diesen Charakter löschen", ['cancel'] = "Abbrechen", ['confirm'] = "Bestätigen",