From 6c7b3ecf9e2f295827ea3060517075896682cd50 Mon Sep 17 00:00:00 2001 From: Mycroft Date: Mon, 3 May 2021 20:39:18 +0100 Subject: [PATCH] tweaks --- client/main.lua | 29 ++++++++++++++++++----------- server/commands.lua | 3 ++- server/common.lua | 8 ++++---- server/functions.lua | 16 ++++++++-------- server/main.lua | 24 ++++++++++++------------ version.json | 2 +- 6 files changed, 45 insertions(+), 37 deletions(-) diff --git a/client/main.lua b/client/main.lua index 7f7a47af..52666913 100644 --- a/client/main.lua +++ b/client/main.lua @@ -60,18 +60,25 @@ end grade_label = playerData.job.grade_label }) end + + ESX.Game.Teleport(PlayerPedId(), { + x = playerData.coords.x, + y = playerData.coords.y, + z = playerData.coords.z + 0.25, + heading = playerData.coords.heading + }, function() + TriggerServerEvent('esx:onPlayerSpawn') + TriggerEvent('esx:onPlayerSpawn') + TriggerEvent('playerSpawned') -- compatibility with old scripts, will be removed soon + TriggerEvent('esx:restoreLoadout') - TriggerServerEvent('esx:onPlayerSpawn') - TriggerEvent('esx:onPlayerSpawn') - TriggerEvent('playerSpawned') -- compatibility with old scripts, will be removed soon - TriggerEvent('esx:restoreLoadout') - - Citizen.Wait(4000) - ShutdownLoadingScreen() - ShutdownLoadingScreenNui() - FreezeEntityPosition(PlayerPedId(), false) - DoScreenFadeIn(10000) - StartServerSyncLoops() + Citizen.Wait(4000) + ShutdownLoadingScreen() + ShutdownLoadingScreenNui() + FreezeEntityPosition(PlayerPedId(), false) + DoScreenFadeIn(10000) + StartServerSyncLoops() + end) TriggerEvent('esx:loadingScreenOff') end) diff --git a/server/commands.lua b/server/commands.lua index 8ad7b518..830298c8 100644 --- a/server/commands.lua +++ b/server/commands.lua @@ -153,7 +153,7 @@ end, true) ESX.RegisterCommand('info', {"user", "admin"}, function(xPlayer, args, showError) local job = xPlayer.getJob().name local jobgrade = xPlayer.getJob().grade_name - print("2ID : ^5"..xPlayer.source.." ^0| ^2Name:^5"..xPlayer.getName().." ^0 | ^2Group:^5"..xPlayer.getGroup().."^0 | ^2Job:^5".. job.."") + print("^2ID : ^5"..xPlayer.source.." ^0| ^2Name:^5"..xPlayer.getName().." ^0 | ^2Group:^5"..xPlayer.getGroup().."^0 | ^2Job:^5".. job.."") end, true) ESX.RegisterCommand('coords', "admin", function(xPlayer, args, showError) @@ -166,6 +166,7 @@ ESX.RegisterCommand('sv_restart', "admin", function(xPlayer, args, showError) for _, playerId in ipairs(GetPlayers()) do DropPlayer(playerId, "Server Restart") end + print('[^5es_extended^0] ^2[INFO] ^1 Server Restarting, Please Wait :)') crash = true while crash do end diff --git a/server/common.lua b/server/common.lua index 406e87f4..c22d8bb3 100644 --- a/server/common.lua +++ b/server/common.lua @@ -41,26 +41,26 @@ MySQL.ready(function() if ESX.Jobs[v.job_name] then ESX.Jobs[v.job_name].grades[tostring(v.grade)] = v else - print(('[es_extended] [^3WARNING^7] Ignoring job grades for "%s" due to missing job'):format(v.job_name)) + print(('[^5es_extended^0] [^3WARNING^7] Ignoring job grades for ^5"%s"^0 due to missing job'):format(v.job_name)) end end for k2,v2 in pairs(ESX.Jobs) do if ESX.Table.SizeOf(v2.grades) == 0 then ESX.Jobs[v2.name] = nil - print(('[es_extended] [^3WARNING^7] Ignoring job "%s" due to no job grades found'):format(v2.name)) + print(('[^5es_extended^0] [^3WARNING^7] Ignoring job ^5"%s"^0due to no job grades found'):format(v2.name)) end end end) end) - print('[es_extended] [^2INFO^7] ESX Legacy developed by The ESX-Framework Team has been initialized') + print('[^5es_extended^0] [^2INFO^7] ESX ^5Legacy^0 initialized') end) RegisterServerEvent('esx:clientLog') AddEventHandler('esx:clientLog', function(msg) if Config.EnableDebug then - print(('[es_extended] [^2TRACE^7] %s^7'):format(msg)) + print(('[^5es_extended^0] [^2TRACE^7] %s^7'):format(msg)) end end) diff --git a/server/functions.lua b/server/functions.lua index eca0a20d..b3fe38a9 100644 --- a/server/functions.lua +++ b/server/functions.lua @@ -1,6 +1,6 @@ ESX.Trace = function(msg) if Config.EnableDebug then - print(('[es_extended] [^2TRACE^7] %s^7'):format(msg)) + print(('[^5es_extended^0] [^2TRACE^7] %s^7'):format(msg)) end end @@ -30,7 +30,7 @@ ESX.RegisterCommand = function(name, group, cb, allowConsole, suggestion) end if ESX.RegisteredCommands[name] then - print(('[es_extended] [^3WARNING^7] An command "%s" is already registered, overriding command'):format(name)) + print(('[^5es_extended^0] [^3WARNING^7] Command ^5"%s" already registered, overriding command'):format(name)) if ESX.RegisteredCommands[name].suggestion then TriggerClientEvent('chat:removeSuggestion', -1, ('/%s'):format(name)) @@ -50,7 +50,7 @@ ESX.RegisterCommand = function(name, group, cb, allowConsole, suggestion) local command = ESX.RegisteredCommands[name] if not command.allowConsole and playerId == 0 then - print(('[es_extended] [^3WARNING^7] %s'):format(_U('commanderror_console'))) + print(('[^5es_extended^0] [^3WARNING^7] ^5%s'):format(_U('commanderror_console'))) else local xPlayer, error = ESX.GetPlayerFromId(playerId), nil @@ -122,14 +122,14 @@ ESX.RegisterCommand = function(name, group, cb, allowConsole, suggestion) if error then if playerId == 0 then - print(('[es_extended] [^3WARNING^7] %s^7'):format(error)) + print(('[^5es_extended^0] [^3WARNING^7] %s^7'):format(error)) else xPlayer.triggerEvent('chat:addMessage', {args = {'^1SYSTEM', error}}) end else cb(xPlayer or false, args, function(msg) if playerId == 0 then - print(('[es_extended] [^3WARNING^7] %s^7'):format(msg)) + print(('[^5es_extended^0] [^3WARNING^7] %s^7'):format(msg)) else xPlayer.triggerEvent('chat:addMessage', {args = {'^1SYSTEM', msg}}) end @@ -159,7 +159,7 @@ ESX.TriggerServerCallback = function(name, requestId, source, cb, ...) if ESX.ServerCallbacks[name] then ESX.ServerCallbacks[name](source, cb, ...) else - print(('[es_extended] [^3WARNING^7] Server callback "%s" does not exist. Make sure that the server sided file really is loading, an error in that file might cause it to not load.'):format(name)) + print(('[^5es_extended^0] [^3WARNING^7] Server callback ^5"%s"^0 does not exist. ^1Please Check The Server File for Errors!'):format(name)) end end @@ -182,7 +182,7 @@ ESX.SavePlayer = function(xPlayer, cb) end) Async.parallel(asyncTasks, function(results) - print(('[es_extended] [^2INFO^7] Saved player "%s^7"'):format(xPlayer.getName())) + print(('[^5es_extended^0] [^2INFO^7] Saved player ^5"%s^7"'):format(xPlayer.getName())) if cb then cb() @@ -201,7 +201,7 @@ ESX.SavePlayers = function(cb) end Async.parallelLimit(asyncTasks, 8, function(results) - print(('[es_extended] [^2INFO^7] Saved %s player(s)'):format(#xPlayers)) + print(('[^5es_extended^0] [^2INFO^7] Saved ^5%s^0 player(s)'):format(#xPlayers)) if cb then cb() end diff --git a/server/main.lua b/server/main.lua index 82fedf51..5c3dff6b 100644 --- a/server/main.lua +++ b/server/main.lua @@ -38,7 +38,7 @@ function onPlayerJoined(playerId) end if IsPlayerAceAllowed(playerId, "command") then - print(('[es_extended] ^5[INFO] ^0 Player ^5%s ^0Has been granted admin permissions via ^5Ace Perms.'):format(playerId)) + print(('[^5es_extended^0] ^2[INFO] ^0 Player ^5%s ^0Has been granted admin permissions via ^5Ace Perms.^7'):format(playerId)) defaultGroup = "admin" else defaultGroup = "user" @@ -123,7 +123,7 @@ function loadESXPlayer(identifier, playerId) if ESX.DoesJobExist(job, grade) then jobObject, gradeObject = ESX.Jobs[job], ESX.Jobs[job].grades[grade] else - print(('[es_extended] [^3WARNING^7] Ignoring invalid job for %s [job: %s, grade: %s]'):format(identifier, job, grade)) + print(('[^5es_extended^0] [^3WARNING^7] Ignoring invalid job for %s [job: %s, grade: %s]'):format(identifier, job, grade)) job, grade = 'unemployed', '0' jobObject, gradeObject = ESX.Jobs[job], ESX.Jobs[job].grades[grade] end @@ -153,7 +153,7 @@ function loadESXPlayer(identifier, playerId) if item then foundItems[name] = count else - print(('[es_extended] [^3WARNING^7] Ignoring invalid item "%s" for "%s"'):format(name, identifier)) + print(('[^5es_extended^0] [^3WARNING^7] Ignoring invalid item "%s" for "%s"'):format(name, identifier)) end end end @@ -214,7 +214,7 @@ function loadESXPlayer(identifier, playerId) if result[1].position and result[1].position ~= '' then userData.coords = json.decode(result[1].position) else - print('[es_extended] [^3WARNING^7] Column "position" in "users" table is missing required default value. Using backup coords, fix your database.') + print('[^5es_extended^0] [^3WARNING^7] Column ^5"position"^0 in ^5"users"^0 table is missing required default value. Using backup coords, fix your database.') userData.coords = {x = -269.4, y = -955.3, z = 31.2, heading = 205.8} end @@ -239,7 +239,7 @@ function loadESXPlayer(identifier, playerId) xPlayer.triggerEvent('esx:createMissingPickups', ESX.Pickups) xPlayer.triggerEvent('esx:registerSuggestions', ESX.RegisteredCommands) - print(('[es_extended] ^5[INFO]^0 Player ^5"%s" ^0has connected to the server. ID: ^5%s'):format(xPlayer.getName(), playerId)) + print(('[^5es_extended^0] [^2INFO^0] Player ^5"%s" ^0has connected to the server. ID: ^5%s^7'):format(xPlayer.getName(), playerId)) end) end @@ -560,12 +560,12 @@ Citizen.CreateThread( else print( ([[ - -^1------------------------------------------------------- -URGENT: YOUR ES-EXTENDED IS OUTDATATED!!! -VERSION: %s AVAILABLE -CHANGELOG: %s -------------------------------------------------------- +^1---------------------------------------------------------------------- +^1URGENT: YOUR ES-EXTENDED IS OUTDATATED!!! +^1COMMIT UPDATE: ^5%s AVAILABLE +^1DOWNLOAD:^5 https://github.com/esx-framework/es_extended/tree/legacy +^1CHANGELOG:^5 %s +^1----------------------------------------------------------------------- ]]):format( rv.commit, rv.changelog @@ -573,7 +573,7 @@ CHANGELOG: %s ) end else - print('ERROR: Es-Extended unable to check version') + print('[^5es_extended^0] [^1ERROR^0] Es-Extended unable to check version!') end end, 'GET' diff --git a/version.json b/version.json index 088e29fe..4bf5b635 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,5 @@ { "version": "legacy", - "commit" : "1.1.5", + "commit" : "1.1.7", "changelog": "Performance Improvements; Config Updates; Bug Fixes" }