From 54c4d6bfd345b6c8cc6d046f426a2104c06f726d Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Sat, 9 Sep 2023 21:32:32 +0200 Subject: [PATCH 1/2] chore: (ox_doorlock) update to version 1.14.3 --- .../resources/[ox]/ox_doorlock/client/main.lua | 2 +- .../resources/[ox]/ox_doorlock/fxmanifest.lua | 2 +- .../[ox]/ox_doorlock/locales/pt-br.json | 18 ++++++++++++++++++ .../ox_doorlock/server/framework/ox_core.lua | 2 +- .../resources/[ox]/ox_doorlock/server/main.lua | 6 ++++-- 5 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 server-data/resources/[ox]/ox_doorlock/locales/pt-br.json diff --git a/server-data/resources/[ox]/ox_doorlock/client/main.lua b/server-data/resources/[ox]/ox_doorlock/client/main.lua index 66e3170c5..536210f5a 100644 --- a/server-data/resources/[ox]/ox_doorlock/client/main.lua +++ b/server-data/resources/[ox]/ox_doorlock/client/main.lua @@ -173,7 +173,7 @@ RegisterNetEvent('ox_doorlock:setState', function(id, state, source, data) local sound = state == 0 and door.unlockSound or door.lockSound or 'door_bolt' local soundId = GetSoundId() - PlaySoundFromCoord(soundId, sound, door.coords.x, door.coords.y, door.coords.z, 'DLC_OXDOORLOCK_SET', true, 0, false) + PlaySoundFromCoord(soundId, sound, door.coords.x, door.coords.y, door.coords.z, 'DLC_OXDOORLOCK_SET', false, 0, false) ReleaseSoundId(soundId) ReleaseNamedScriptAudioBank('dlc_oxdoorlock/oxdoorlock') else diff --git a/server-data/resources/[ox]/ox_doorlock/fxmanifest.lua b/server-data/resources/[ox]/ox_doorlock/fxmanifest.lua index 208d3d288..3610bfc8b 100644 --- a/server-data/resources/[ox]/ox_doorlock/fxmanifest.lua +++ b/server-data/resources/[ox]/ox_doorlock/fxmanifest.lua @@ -6,7 +6,7 @@ game 'gta5' --[[ Resource Information ]]-- name 'ox_doorlock' -version '1.14.1' +version '1.14.3' license 'GPL-3.0-or-later' author 'Overextended' repository 'https://github.com/overextended/ox_doorlock' diff --git a/server-data/resources/[ox]/ox_doorlock/locales/pt-br.json b/server-data/resources/[ox]/ox_doorlock/locales/pt-br.json new file mode 100644 index 000000000..bca8ad2ac --- /dev/null +++ b/server-data/resources/[ox]/ox_doorlock/locales/pt-br.json @@ -0,0 +1,18 @@ +{ + "unlocked_door": "Porta Destrancada", + "locked_door": "Porta Trancada", + "lock_door": "[E] Trancar Porta", + "unlock_door": "[E] Destrancar Porta", + "door_lock": "Fechadura", + "passcode": "Senha", + "lockpick_broke": "Sua lockpick quebrou", + "pick_lock": "Usar Lockpick", + "add_lock": "Adicionar Fechadura", + "edit_lock": "Editar Fechadura", + "remove_lock": "Remover Fechadura", + "cannot_unlock": "Não foi possivel destrancar a porta", + "cannot_lock": "Não foi possível trancar a porta", + "create_modify_lock": "Criar uma fechadura, ou modificar uma existente", + "add_door_textui": "**Criar nova fechadura** \nInteragir com [LMB] \nCancelar com [RMB]", + "command_closest": "Abra a interface mais próximo da fechadura" +} diff --git a/server-data/resources/[ox]/ox_doorlock/server/framework/ox_core.lua b/server-data/resources/[ox]/ox_doorlock/server/framework/ox_core.lua index a32197145..4b7e76d42 100644 --- a/server-data/resources/[ox]/ox_doorlock/server/framework/ox_core.lua +++ b/server-data/resources/[ox]/ox_doorlock/server/framework/ox_core.lua @@ -20,7 +20,7 @@ end GetPlayer = Ox.GetPlayer function GetCharacterId(player) - return player.charid + return player.charId end function IsPlayerInGroup(player, groups) diff --git a/server-data/resources/[ox]/ox_doorlock/server/main.lua b/server-data/resources/[ox]/ox_doorlock/server/main.lua index 52a4196a7..64162f70a 100644 --- a/server-data/resources/[ox]/ox_doorlock/server/main.lua +++ b/server-data/resources/[ox]/ox_doorlock/server/main.lua @@ -181,7 +181,7 @@ function DoesPlayerHaveItem(player, items, alwaysRemove) for i = 1, #items do local item = items[i] local itemName = item.name or item - local data = ox_inventory:Search(playerId, 1, itemName, item.metadata)[1] + local data = ox_inventory:Search(playerId, 'slots', itemName, item.metadata)[1] if data and data.count > 0 then if alwaysRemove or item.remove then @@ -233,7 +233,9 @@ local function isAuthorised(playerId, door, lockpick) return authorised end -MySQL.query(LoadResourceFile(cache.resource, 'sql/ox_doorlock.sql')) +local sql = LoadResourceFile(cache.resource, 'sql/ox_doorlock.sql') + +if sql then MySQL.query(sql) end MySQL.ready(function() while Config.DoorList do Wait(100) end From b4ed859634b74417bc8de8fb2e902c4a9db70361 Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Sat, 9 Sep 2023 21:33:42 +0200 Subject: [PATCH 2/2] delete: easyadmin_permissions.cfg --- server-data/easyadmin_permissions.cfg | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 server-data/easyadmin_permissions.cfg diff --git a/server-data/easyadmin_permissions.cfg b/server-data/easyadmin_permissions.cfg deleted file mode 100644 index f60a3cfd3..000000000 --- a/server-data/easyadmin_permissions.cfg +++ /dev/null @@ -1,14 +0,0 @@ -add_ace resource.EasyAdmin command.add_ace allow -add_ace resource.EasyAdmin command.remove_ace allow -add_ace resource.EasyAdmin command.add_principal allow -add_ace resource.EasyAdmin command.remove_principal allow - -setr ea_LanguageName "it" #This Convars dictates in which language EasyAdmin is displayed ( this includes but is not limited to GUI, Kick Messages, Reasons, Hud Elements.. ) Available options: de, en, es, fr, it, nl, pl -set ea_enableReportCommand "true" #Enables "report" command -set ea_callAdminCommandName "calladmin" #Defines what the command to call an admin will be -set ea_reportCommandName "report" #Defines what the command to report a player will be -set ea_callAdminCooldown 360 #In Seconds, how long a Player will not be able to use callAdmin after using it once. - -##STAFF## -add_principal identifier.license:"you license" group.admin # remove "" -