diff --git a/init.lua b/init.lua index 6dfaba9..533b065 100644 --- a/init.lua +++ b/init.lua @@ -7,12 +7,6 @@ function Bridge.RegisterModule(moduleName, moduleTable) end return end - if Bridge[moduleName] then - if BridgeSharedConfig.DebugLevel ~= 0 then - print("^6Module already registered:", moduleName, "^0") - end - return - end local wrappedModule = {} if type(moduleTable) == 'function' then diff --git a/lib/client/utility.lua b/lib/client/utility.lua index 9373e10..07d9897 100644 --- a/lib/client/utility.lua +++ b/lib/client/utility.lua @@ -241,7 +241,7 @@ Utility.RegisterPoint = function(pointCoords, pointDistance, pointOnEnter, point pointOnExit(self) end, }) - local pointID = Utility.CreateUniqueId(nil, 5, nil) + local pointID = Bridge.Ids.RandomLower(nil, 8) ActivePoints[pointID] = enterZone return enterZone, pointID end diff --git a/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua b/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua index 75778f6..7b17541 100644 --- a/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua +++ b/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua @@ -1,5 +1,5 @@ if GetResourceState('MrNewbVehicleKeys') ~= 'started' then return end -VehicleKey = {} +VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) if not DoesEntityExist(vehicle) then return false end diff --git a/modules/vehicleKey/MrNewbVehicleKeys/server/server.lua b/modules/vehicleKey/MrNewbVehicleKeys/server/server.lua index d8b4654..f8d74ae 100644 --- a/modules/vehicleKey/MrNewbVehicleKeys/server/server.lua +++ b/modules/vehicleKey/MrNewbVehicleKeys/server/server.lua @@ -1,5 +1,5 @@ if GetResourceState('MrNewbVehicleKeys') ~= 'started' then return end -VehicleKey = {} +VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(src, vehicle, plate) --wip diff --git a/modules/vehicleKey/Renewed-Vehiclekeys/client/client.lua b/modules/vehicleKey/Renewed-Vehiclekeys/client/client.lua index 6d502de..0682798 100644 --- a/modules/vehicleKey/Renewed-Vehiclekeys/client/client.lua +++ b/modules/vehicleKey/Renewed-Vehiclekeys/client/client.lua @@ -1,5 +1,5 @@ if GetResourceState('Renewed-Vehiclekeys') ~= 'started' then return end -VehicleKey = {} +VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) if not DoesEntityExist(vehicle) then return false end diff --git a/modules/vehicleKey/Renewed-Vehiclekeys/server/server.lua b/modules/vehicleKey/Renewed-Vehiclekeys/server/server.lua index 5f5ba9f..ed5552d 100644 --- a/modules/vehicleKey/Renewed-Vehiclekeys/server/server.lua +++ b/modules/vehicleKey/Renewed-Vehiclekeys/server/server.lua @@ -1,5 +1,5 @@ if GetResourceState('Renewed-Vehiclekeys') ~= 'started' then return end -VehicleKey = {} +VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(src, vehicle, plate) --wip diff --git a/modules/vehicleKey/_default/client/client.lua b/modules/vehicleKey/_default/client/client.lua index 8e2d8cd..3aca84b 100644 --- a/modules/vehicleKey/_default/client/client.lua +++ b/modules/vehicleKey/_default/client/client.lua @@ -1,4 +1,4 @@ -VehicleKey = {} +VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) diff --git a/modules/vehicleKey/_default/server/server.lua b/modules/vehicleKey/_default/server/server.lua index 95dc21f..26b525d 100644 --- a/modules/vehicleKey/_default/server/server.lua +++ b/modules/vehicleKey/_default/server/server.lua @@ -1,4 +1,4 @@ -VehicleKey = {} +VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(src, vehicle, plate) --wip diff --git a/modules/vehicleKey/cd_garage/client/client.lua b/modules/vehicleKey/cd_garage/client/client.lua index 310b9eb..7651f69 100644 --- a/modules/vehicleKey/cd_garage/client/client.lua +++ b/modules/vehicleKey/cd_garage/client/client.lua @@ -1,5 +1,5 @@ if GetResourceState('cd_garage') ~= 'started' then return end -VehicleKey = {} +VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) TriggerEvent('cd_garage:AddKeys', plate) diff --git a/modules/vehicleKey/cd_garage/server/server.lua b/modules/vehicleKey/cd_garage/server/server.lua index 1f641f2..96a29e5 100644 --- a/modules/vehicleKey/cd_garage/server/server.lua +++ b/modules/vehicleKey/cd_garage/server/server.lua @@ -1,5 +1,5 @@ if GetResourceState('cd_garage') ~= 'started' then return end -VehicleKey = {} +VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(src, vehicle, plate) --wip diff --git a/modules/vehicleKey/mk_vehiclekeys/client/client.lua b/modules/vehicleKey/mk_vehiclekeys/client/client.lua index 82d7f4c..d2ca909 100644 --- a/modules/vehicleKey/mk_vehiclekeys/client/client.lua +++ b/modules/vehicleKey/mk_vehiclekeys/client/client.lua @@ -1,5 +1,5 @@ if GetResourceState('mk_vehiclekeys') ~= 'started' then return end -VehicleKey = {} +VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) if not DoesEntityExist(vehicle) then return false end diff --git a/modules/vehicleKey/mk_vehiclekeys/server/server.lua b/modules/vehicleKey/mk_vehiclekeys/server/server.lua index 4c0ab91..54e50e8 100644 --- a/modules/vehicleKey/mk_vehiclekeys/server/server.lua +++ b/modules/vehicleKey/mk_vehiclekeys/server/server.lua @@ -1,5 +1,5 @@ if GetResourceState('mk_vehiclekeys') ~= 'started' then return end -VehicleKey = {} +VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(src, vehicle, plate) -- wip diff --git a/modules/vehicleKey/okokGarage/client/client.lua b/modules/vehicleKey/okokGarage/client/client.lua index 88543e4..5338e6a 100644 --- a/modules/vehicleKey/okokGarage/client/client.lua +++ b/modules/vehicleKey/okokGarage/client/client.lua @@ -1,5 +1,5 @@ if GetResourceState('okokGarage') ~= 'started' then return end -VehicleKey = {} +VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) TriggerServerEvent('okokGarage:GiveKeys', plate) diff --git a/modules/vehicleKey/okokGarage/server/server.lua b/modules/vehicleKey/okokGarage/server/server.lua index c57126a..0669b0a 100644 --- a/modules/vehicleKey/okokGarage/server/server.lua +++ b/modules/vehicleKey/okokGarage/server/server.lua @@ -1,5 +1,5 @@ if GetResourceState('okokGarage') ~= 'started' then return end -VehicleKey = {} +VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(src, vehicle, plate) --wip diff --git a/modules/vehicleKey/qb-vehiclekeys/client/client.lua b/modules/vehicleKey/qb-vehiclekeys/client/client.lua index 226200e..fda29d8 100644 --- a/modules/vehicleKey/qb-vehiclekeys/client/client.lua +++ b/modules/vehicleKey/qb-vehiclekeys/client/client.lua @@ -1,6 +1,6 @@ if GetResourceState('qb-vehiclekeys') ~= 'started' then return end if GetResourceState('qbx_vehiclekeys') == 'started' then return end -VehicleKey = {} +VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) TriggerServerEvent('qb-vehiclekeys:server:AcquireVehicleKeys', plate) diff --git a/modules/vehicleKey/qb-vehiclekeys/server/server.lua b/modules/vehicleKey/qb-vehiclekeys/server/server.lua index 45829e3..6f07ac6 100644 --- a/modules/vehicleKey/qb-vehiclekeys/server/server.lua +++ b/modules/vehicleKey/qb-vehiclekeys/server/server.lua @@ -1,6 +1,6 @@ if GetResourceState('qb-vehiclekeys') ~= 'started' then return end if GetResourceState('qbx_vehiclekeys') == 'started' then return end -VehicleKey = {} +VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(src, vehicle, plate) --wip diff --git a/modules/vehicleKey/qbx_vehiclekeys/client/client.lua b/modules/vehicleKey/qbx_vehiclekeys/client/client.lua index f46158c..8de11a0 100644 --- a/modules/vehicleKey/qbx_vehiclekeys/client/client.lua +++ b/modules/vehicleKey/qbx_vehiclekeys/client/client.lua @@ -1,5 +1,5 @@ if GetResourceState('qbx_vehiclekeys') ~= 'started' then return end -VehicleKey = {} +VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) TriggerServerEvent('qb-vehiclekeys:server:AcquireVehicleKeys', plate) diff --git a/modules/vehicleKey/qbx_vehiclekeys/server/server.lua b/modules/vehicleKey/qbx_vehiclekeys/server/server.lua index 989d06f..ae9ec98 100644 --- a/modules/vehicleKey/qbx_vehiclekeys/server/server.lua +++ b/modules/vehicleKey/qbx_vehiclekeys/server/server.lua @@ -1,5 +1,5 @@ if GetResourceState('qbx_vehiclekeys') ~= 'started' then return end -VehicleKey = {} +VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(src, vehicle, plate) --wip diff --git a/modules/vehicleKey/qs-vehiclekeys/client/client.lua b/modules/vehicleKey/qs-vehiclekeys/client/client.lua index aca4377..aa85802 100644 --- a/modules/vehicleKey/qs-vehiclekeys/client/client.lua +++ b/modules/vehicleKey/qs-vehiclekeys/client/client.lua @@ -1,5 +1,5 @@ if GetResourceState('qs-vehiclekeys') ~= 'started' then return end -VehicleKey = {} +VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) local model = GetDisplayNameFromVehicleModel(GetEntityModel(vehicle)) diff --git a/modules/vehicleKey/qs-vehiclekeys/server/server.lua b/modules/vehicleKey/qs-vehiclekeys/server/server.lua index a9fc806..5a07ae3 100644 --- a/modules/vehicleKey/qs-vehiclekeys/server/server.lua +++ b/modules/vehicleKey/qs-vehiclekeys/server/server.lua @@ -1,5 +1,5 @@ if GetResourceState('qs-vehiclekeys') ~= 'started' then return end -VehicleKey = {} +VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(src, vehicle, plate) --wip diff --git a/modules/vehicleKey/t1ger_keys/client/client.lua b/modules/vehicleKey/t1ger_keys/client/client.lua index 112e14b..6f34b03 100644 --- a/modules/vehicleKey/t1ger_keys/client/client.lua +++ b/modules/vehicleKey/t1ger_keys/client/client.lua @@ -1,5 +1,5 @@ if GetResourceState('t1ger_keys') ~= 'started' then return end -VehicleKey = {} +VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) if not DoesEntityExist(vehicle) then return false end diff --git a/modules/vehicleKey/t1ger_keys/server/server.lua b/modules/vehicleKey/t1ger_keys/server/server.lua index 00c388c..569b2f3 100644 --- a/modules/vehicleKey/t1ger_keys/server/server.lua +++ b/modules/vehicleKey/t1ger_keys/server/server.lua @@ -1,5 +1,5 @@ if GetResourceState('t1ger_keys') ~= 'started' then return end -VehicleKey = {} +VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(src, vehicle, plate) --wip diff --git a/modules/vehicleKey/wasabi_carlock/client/client.lua b/modules/vehicleKey/wasabi_carlock/client/client.lua index d71e8a6..7f5704b 100644 --- a/modules/vehicleKey/wasabi_carlock/client/client.lua +++ b/modules/vehicleKey/wasabi_carlock/client/client.lua @@ -1,5 +1,5 @@ if GetResourceState('wasabi_carlock') ~= 'started' then return end -VehicleKey = {} +VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) exports.wasabi_carlock:GiveKey(plate) diff --git a/modules/vehicleKey/wasabi_carlock/server/server.lua b/modules/vehicleKey/wasabi_carlock/server/server.lua index cd05593..55c7838 100644 --- a/modules/vehicleKey/wasabi_carlock/server/server.lua +++ b/modules/vehicleKey/wasabi_carlock/server/server.lua @@ -1,5 +1,5 @@ if GetResourceState('wasabi_carlock') ~= 'started' then return end -VehicleKey = {} +VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(src, vehicle, plate) --wip