Merge pull request #1292 from esx-framework/dev

🎉 New release 1.10.3

[SQL]/legacy.sql

@@ -1011,6 +1011,7 @@ CREATE TABLE IF NOT EXISTS `banking` (
   `time` bigint(20) DEFAULT NULL,
   `ID` int(11) NOT NULL AUTO_INCREMENT,
   `balance` int(11) DEFAULT 0,
+  `label` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`ID`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
 

[core]/cron/server/main.lua

@@ -2,49 +2,49 @@ local Jobs = {}
 local LastTime = nil
 
 function RunAt(h, m, cb)
-	Jobs[#Jobs + 1] = {
-		h = h,
-		m = m,
-		cb = cb
-	}
+    Jobs[#Jobs + 1] = {
+        h = h,
+        m = m,
+        cb = cb,
+    }
 end
 
 function GetUnixTimestamp()
-	return os.time()
+    return os.time()
 end
 
 function OnTime(time)
-	for i = 1, #Jobs, 1 do
-		local scheduledTimestamp = os.time({
-			hour = Jobs[i].h,
-			minute = Jobs[i].m,
-			second = 0, -- Assuming tasks run at the start of the minute
-			day = os.date('%d', time),
-			month = os.date('%m', time),
-			year = os.date('%Y', time)
-		})
-
-		if time >= scheduledTimestamp and (not LastTime or LastTime < scheduledTimestamp) then
-			Jobs[i].cb(Jobs[i].h, Jobs[i].m)
-		end
-	end
+    for i = 1, #Jobs, 1 do
+        local scheduledTimestamp = os.time({
+            hour = Jobs[i].h,
+            minute = Jobs[i].m,
+            second = 0, -- Assuming tasks run at the start of the minute
+            day = os.date("%d", time),
+            month = os.date("%m", time),
+            year = os.date("%Y", time),
+        })
+
+        if time >= scheduledTimestamp and (not LastTime or LastTime < scheduledTimestamp) then
+            Jobs[i].cb(Jobs[i].h, Jobs[i].m)
+        end
+    end
 end
 
 function Tick()
-	local time = GetUnixTimestamp()
+    local time = GetUnixTimestamp()
 
-	if not LastTime or os.date('%M', time) ~= os.date('%M', LastTime) then
-		OnTime(time)
-		LastTime = time
-	end
+    if not LastTime or os.date("%M", time) ~= os.date("%M", LastTime) then
+        OnTime(time)
+        LastTime = time
+    end
 
-	SetTimeout(60000, Tick)
+    SetTimeout(60000, Tick)
 end
 
 LastTime = GetUnixTimestamp()
 
 Tick()
 
-AddEventHandler('cron:runAt', function(h, m, cb)
-	RunAt(h, m, cb)
+AddEventHandler("cron:runAt", function(h, m, cb)
+    RunAt(h, m, cb)
 end)

[core]/es_extended/client/common.lua

@@ -1,12 +1,10 @@
-exports('getSharedObject', function()
-	return ESX
+exports("getSharedObject", function()
+    return ESX
 end)
 
-if GetResourceState('ox_inventory') ~= 'missing' then
-	Config.OxInventory = true
-end
+Config.OxInventory = GetResourceState("ox_inventory"):find("start") and true
 
 AddEventHandler("esx:getSharedObject", function()
-	local Invoke = GetInvokingResource()
-	print(("[^1ERROR^7] Resource ^5%s^7 Used the ^5getSharedObject^7 Event, this event ^1no longer exists!^7 Visit https://documentation.esx-framework.org/tutorials/tutorials-esx/sharedevent for how to fix!"):format(Invoke))
+    local Invoke = GetInvokingResource()
+    print(("[^1ERROR^7] Resource ^5%s^7 Used the ^5getSharedObject^7 Event, this event ^1no longer exists!^7 Visit https://documentation.esx-framework.org/tutorials/tutorials-esx/sharedevent for how to fix!"):format(Invoke))
 end)