Merge pull request #34 from mafewtm/main

refactor: readability and formatting consistancy

bridge/esx/client.lua

@@ -26,7 +26,6 @@ end)
 
 RegisterNetEvent('esx:onPlayerLogout', function()
     Player = table.wipe(Player)
-    TriggerEvent('interact:groupsChanged', {})
-end)
 
-return Bridge
+    TriggerEvent('interact:groupsChanged', {})
+end)

bridge/ox/client.lua

@@ -20,6 +20,7 @@ end)
 
 AddEventHandler('ox:playerLogout', function()
     table.wipe(Player)
+
     TriggerEvent('interact:groupsChanged', {})
 end)
 

bridge/qb/client.lua

@@ -24,6 +24,7 @@ end)
 
 RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function()
     local PlayerData = QBCore.Functions.GetPlayerData()
+
     Player = {
         Group = {
             [PlayerData.job.name] = PlayerData.job.grade.level,
@@ -38,6 +39,6 @@ end)
 
 RegisterNetEvent('QBCore:Client:OnPlayerUnload', function()
     Player = table.wipe(Player)
-    TriggerEvent('interact:groupsChanged', {})
-end)
 
+    TriggerEvent('interact:groupsChanged', {})
+end)

client/defaults.lua

@@ -1,6 +1,4 @@
-if GetConvar('interact_disabledefault', 'false') == 'true' then
-    return
-end
+if GetConvar('interact_disabledefault', 'false') == 'true' then return end
 
 local api = require 'client.interactions'
 
@@ -23,12 +21,11 @@ api.addGlobalVehicleInteraction({
             end
 
             local plate = GetVehicleNumberPlateText(entity)
-            local invId = 'trunk'..plate
             local coords = GetEntityCoords(entity)
 
             TaskTurnPedToFaceCoord(cache.ped, coords.x, coords.y, coords.z, 0)
 
-            if not exports.ox_inventory:openInventory('trunk', { id = invId, netid = NetworkGetNetworkIdFromEntity(entity), entityid = entity, door = 5 }) then return end
+            if not exports.ox_inventory:openInventory('trunk', { id = ('trunk%s'):format(plate), netid = NetworkGetNetworkIdFromEntity(entity), entityid = entity, door = 5 }) then return end
         end,
     }
 })

client/entities.lua

@@ -9,6 +9,7 @@ local subCache = {}
 
 function entities.isNetIdNearby(netID)
     local entity = netIds[netID]
+
     return entity and entity.entity
 end
 
@@ -31,24 +32,25 @@ function entities.getEntitiesByType(type)
 
     for k, v in pairs(localEnties) do
         if v.type == type then
-            amount = amount + 1
+            amount += 1
             entityTable[amount] = k
         end
     end
 
     for _, v in pairs(netIds) do
         if v.type == type then
-            amount = amount + 1
+            amount += 1
             entityTable[amount] = v.entity
         end
     end
 
-    if type == "players" then
-        for k, v in pairs(playersTable) do
-            amount = amount + 1
+    if type == 'players' then
+        for _, v in pairs(playersTable) do
+            amount += 1
             entityTable[amount] = v.entity
             serverIds[amount] = v.serverId
         end
+
         return amount, entityTable, serverIds
     end
 
@@ -112,6 +114,7 @@ end
 CreateThread(function()
     while true do
         local playerCoords = GetEntityCoords(cache.ped)
+
         clearTables()
 
         buildEntities('CVehicle', playerCoords)
@@ -131,36 +134,42 @@ RegisterNetEvent('onPlayerJoining', function(serverId)
 
     local ent = lib.waitFor(function()
         local ped = GetPlayerPed(playerId)
-        if ped > 0 then return ped end
+
+        if ped > 0 then
+            return ped
+        end
     end, '', 10000)
-    
+
     playersTable[serverId] = {
         entity = ent,
         serverId = serverId,
-        type = "players",
+        type = 'players',
     }
 end)
 
-AddEventHandler('onResourceStart', function(name)
-    if name == GetCurrentResourceName() then
-        local players = GetActivePlayers()
-
-        for i = 1, #players do
-            local playerId = players[i]
-            local serverId = GetPlayerServerId(playerId)
-            if serverId ~= cache.serverId then 
-
-                local ent = lib.waitFor(function()
-                    local ped = GetPlayerPed(playerId)
-                    if ped > 0 then return ped end
-                end, '', 10000)
-
-                playersTable[serverId] = {
-                    entity = ent,
-                    serverId = serverId,
-                    type = "players",
-                }
-            end
+AddEventHandler('onResourceStart', function(resource)
+    if resource ~= cache.resource then return end
+
+    local players = GetActivePlayers()
+
+    for i = 1, #players do
+        local playerId = players[i]
+        local serverId = GetPlayerServerId(playerId)
+
+        if serverId ~= cache.serverId then
+            local ent = lib.waitFor(function()
+                local ped = GetPlayerPed(playerId)
+
+                if ped > 0 then
+                    return ped
+                end
+            end, '', 10000)
+
+            playersTable[serverId] = {
+                entity = ent,
+                serverId = serverId,
+                type = 'players',
+            }
         end
     end
 end)