starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-30 01:38:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1154 from Kenshiin13/Better-SetCoords

Browse Source 
Feature Request 1143: Added 'coordinate' arg type for ESX.RegisterCommand()
This commit is contained in:
Gellipapa
2023-08-18 19:11:37 +02:00
committed by GitHub
parent 1f48b63af2 c279b4e6dc
commit ba594a73a8
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[core]/es_extended/server/commands.lua
+4 -4
View File
@@ -1,4 +1,4 @@
ESX.RegisterCommand('setcoords', 'admin', function(xPlayer, args)
ESX.RegisterCommand({'setcoords', 'tp'}, 'admin', function(xPlayer, args)
xPlayer.setCoords({ x = args.x, y = args.y, z = args.z })
if Config.AdminLogging then
ESX.DiscordLogFields("UserActions", "Set Coordinates /setcoords Triggered!", "pink", {
@@ -13,9 +13,9 @@ end, false, {
help = TranslateCap('command_setcoords'),
validate = true,
arguments = {
{ name = 'x', help = TranslateCap('command_setcoords_x'), type = 'number' },
{ name = 'y', help = TranslateCap('command_setcoords_y'), type = 'number' },
{ name = 'z', help = TranslateCap('command_setcoords_z'), type = 'number' }
{ name = 'x', help = TranslateCap('command_setcoords_x'), type = 'coordinate' },
{ name = 'y', help = TranslateCap('command_setcoords_y'), type = 'coordinate' },
{ name = 'z', help = TranslateCap('command_setcoords_z'), type = 'coordinate' }
}
})
[core]/es_extended/server/functions.lua
+8 -1
View File
@@ -113,7 +113,14 @@ function ESX.RegisterCommand(name, group, cb, allowConsole, suggestion)
local merge = table.concat(args, " ")
newArgs[v.name] = string.sub(merge, lenght)
end
elseif v.type == 'coordinate' then
local coord = tonumber(args[k]:match("(-?%d+%.?%d*)"))
if(not coord) then
error = TranslateCap('commanderror_argumentmismatch_number', k)
else
newArgs[v.name] = coord
end
end
end
--backwards compatibility