Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: (ox_doorlock) update to version 1.14.3 #510

Merged
merged 2 commits into from
Sep 9, 2023
Merged

chore: (ox_doorlock) update to version 1.14.3 #510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54c4d6b
chore: (ox_doorlock) update to version 1.14.3
bitpredator Sep 9, 2023
b4ed859
delete: easyadmin_permissions.cfg
bitpredator Sep 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions server-data/easyadmin_permissions.cfg
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion server-data/resources/[ox]/ox_doorlock/client/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion server-data/resources/[ox]/ox_doorlock/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
18 changes: 18 additions & 0 deletions server-data/resources/[ox]/ox_doorlock/locales/pt-br.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
2 changes: 1 addition & 1 deletion server-data/resources/[ox]/ox_doorlock/server/framework/ox_core.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ end
GetPlayer = Ox.GetPlayer

function GetCharacterId(player)
return player.charid
return player.charId
end

function IsPlayerInGroup(player, groups)
Expand Down
6 changes: 4 additions & 2 deletions server-data/resources/[ox]/ox_doorlock/server/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down