Merge pull request #510 from bitpredator/develop

chore: (ox_doorlock) update to version 1.14.3
bitpredator · Sep 9, 2023 · 5706ad7 · 5706ad7
2 parents ddc9158 + b4ed859
commit 5706ad7
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 19 deletions.
diff --git a/server-data/easyadmin_permissions.cfg b/server-data/easyadmin_permissions.cfg
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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