Merge pull request #1864 from esx-framework/v1.14.1

Bump legacy version to 1.14.1

Author: N0tNvll

[SQL]/legacy.sql

@@ -16,7 +16,8 @@ INSERT INTO `addon_account` (`name`, `label`, `shared`) VALUES
 ('society_cardealer', 'Cardealer', 1),
 ('society_mechanic', 'Mechanic', 1),
 ('society_police', 'Police', 1),
-('society_taxi', 'Taxi', 1);
+('society_taxi', 'Taxi', 1),
+('bank_savings','Savings account',0);
 
 -- --------------------------------------------------------
 
@@ -89,7 +90,7 @@ CREATE TABLE `billing` (
   `identifier` varchar(60) NOT NULL,
   `sender` varchar(60) NOT NULL,
   `target_type` varchar(50) NOT NULL,
-  `target` varchar(40) NOT NULL,
+  `target` varchar(60) NOT NULL,
   `label` varchar(255) NOT NULL,
   `amount` int(11) NOT NULL
 ) ENGINE=InnoDB;
@@ -364,7 +365,7 @@ CREATE TABLE `rented_vehicles` (
   `player_name` varchar(255) NOT NULL,
   `base_price` int(11) NOT NULL,
   `rent_price` int(11) NOT NULL,
-  `owner` varchar(22) NOT NULL
+  `owner` varchar(60) NOT NULL
 ) ENGINE=InnoDB;
 
 --
@@ -749,7 +750,8 @@ ALTER TABLE `addon_account`
 ALTER TABLE `addon_account_data`
   ADD PRIMARY KEY (`id`),
   ADD UNIQUE KEY `index_addon_account_data_account_name_owner` (`account_name`,`owner`),
-  ADD KEY `index_addon_account_data_account_name` (`account_name`);
+  ADD KEY `index_addon_account_data_account_name` (`account_name`),
+  ADD KEY `esx_addon_account_data_owner` (`owner`);
 
 --
 -- Indexes for table `addon_inventory`
@@ -764,13 +766,15 @@ ALTER TABLE `addon_inventory_items`
   ADD PRIMARY KEY (`id`),
   ADD KEY `index_addon_inventory_items_inventory_name_name` (`inventory_name`,`name`),
   ADD KEY `index_addon_inventory_items_inventory_name_name_owner` (`inventory_name`,`name`,`owner`),
-  ADD KEY `index_addon_inventory_inventory_name` (`inventory_name`);
+  ADD KEY `index_addon_inventory_inventory_name` (`inventory_name`),
+  ADD KEY `esx_addon_inventory_items_owner` (`owner`);
 
 --
 -- Indexes for table `billing`
 --
 ALTER TABLE `billing`
-  ADD PRIMARY KEY (`id`);
+  ADD PRIMARY KEY (`id`),
+  ADD KEY `esx_billing_identifier` (`identifier`);
 
 --
 -- Indexes for table `cardealer_vehicles`
@@ -790,7 +794,8 @@ ALTER TABLE `datastore`
 ALTER TABLE `datastore_data`
   ADD PRIMARY KEY (`id`),
   ADD UNIQUE KEY `index_datastore_data_name_owner` (`name`,`owner`),
-  ADD KEY `index_datastore_data_name` (`name`);
+  ADD KEY `index_datastore_data_name` (`name`),
+  ADD KEY `esx_datastore_data_owner` (`owner`);
 
 --
 -- Indexes for table `items`
@@ -821,7 +826,8 @@ ALTER TABLE `licenses`
 -- Indexes for table `owned_vehicles`
 --
 ALTER TABLE `owned_vehicles`
-  ADD PRIMARY KEY (`plate`);
+  ADD PRIMARY KEY (`plate`),
+  ADD KEY `esx_owned_vehicles_owner` (`owner`);
 
 --
 --
@@ -840,7 +846,8 @@ ALTER TABLE `rented_vehicles`
 -- Indexes for table `society_moneywash`
 --
 ALTER TABLE `society_moneywash`
-  ADD PRIMARY KEY (`id`);
+  ADD PRIMARY KEY (`id`),
+  ADD KEY `esx_society_moneywash_identifier` (`identifier`);
 
 --
 -- Indexes for table `users`
@@ -856,7 +863,8 @@ ALTER TABLE `users`
 -- Indexes for table `user_licenses`
 --
 ALTER TABLE `user_licenses`
-  ADD PRIMARY KEY (`id`);
+  ADD PRIMARY KEY (`id`),
+  ADD KEY `esx_user_licenses_owner` (`owner`);
 
 --
 -- Indexes for table `vehicle_categories`
@@ -991,27 +999,6 @@ INSERT INTO `fine_types` (label, amount, category) VALUES
 	('Fraud', 2000, 2);
 
 
---
--- ESX Bankerjob
---
-
-INSERT INTO `addon_account` (name, label, shared) VALUES
-	('society_banker','Bank',1),
-	('bank_savings','Savings account',0)
-;
-
-INSERT INTO `jobs` (name, label) VALUES
-	('banker','Banker')
-;
-
-INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES
-	('banker',0,'advisor','Consultant',10,'{}','{}'),
-	('banker',1,'banker','Banker',20,'{}','{}'),
-	('banker',2,'business_banker',"Investment banker",30,'{}','{}'),
-	('banker',3,'trader','Broker',40,'{}','{}'),
-	('banker',4,'boss','Boss',0,'{}','{}')
-;
-
 --
 -- ESX Banking
 --

[core]/cron/server/main.lua

@@ -26,19 +26,30 @@ end
 
 ---@param timestamp number
 function OnTime(timestamp)
-    for i = 1, #cronJobs, 1 do
-        local scheduledTimestamp = os.time({
-            hour = cronJobs[i].h,
-            min = cronJobs[i].m,
+    local function scheduledAt(job, dayOffset)
+        return os.time({
+            hour = job.h,
+            min = job.m,
             sec = 0, -- Assuming tasks run at the start of the minute
-            day = os.date("%d", timestamp),
+            day = os.date("%d", timestamp) + dayOffset,
             month = os.date("%m", timestamp),
             year = os.date("%Y", timestamp),
         })
+    end
+
+    for i = 1, #cronJobs, 1 do
+        local scheduledTimestamp = scheduledAt(cronJobs[i], 0)
 
-        if timestamp >= scheduledTimestamp and (not lastTimestamp or lastTimestamp < scheduledTimestamp) then
+        if scheduledTimestamp > timestamp then
+            scheduledTimestamp = scheduledAt(cronJobs[i], -1)
+        end
+
+        if not lastTimestamp or lastTimestamp < scheduledTimestamp then
             local d = os.date('*t', scheduledTimestamp).wday
-            cronJobs[i].cb(d, cronJobs[i].h, cronJobs[i].m)
+
+            if not pcall(cronJobs[i].cb, d, cronJobs[i].h, cronJobs[i].m) then
+                print(("[^1ERROR^7] cron job at ^5%02d:%02d^7 errored, skipping it"):format(cronJobs[i].h, cronJobs[i].m))
+            end
         end
     end
 end

[core]/es_extended/client/modules/adjustments.lua

@@ -25,7 +25,9 @@ function Adjustments:DisableNPCDrops()
 end
 
 function Adjustments:SeatShuffle()
-    if Config.DisableVehicleSeatShuff then
+    if Config.DisableVehicleSeatShuff and not self.seatShuffleRegistered then
+        self.seatShuffleRegistered = true
+
         AddEventHandler("esx:enteredVehicle", function(vehicle, _, seat)
             if seat > -1 then
                 SetPedIntoVehicle(ESX.PlayerData.ped, vehicle, seat)
@@ -43,7 +45,7 @@ end
 
 function Adjustments:AmmoAndVehicleRewards()
     CreateThread(function()
-        while true do
+        while ESX.PlayerLoaded do
             if Config.DisableDisplayAmmo then
                 DisplayAmmoThisFrame(false)
             end
@@ -175,19 +177,19 @@ function Adjustments:ReplacePlaceholders(text)
         local success, result = pcall(cb)
 
         if not success then
-            error(("Failed to execute placeholder: ^5%s^7\n%s"):format(placeholder, result))
+            print(("[^1ERROR^7] Failed to execute placeholder: ^5%s^7\n%s"):format(placeholder, result))
             result = "Unknown"
         end
 
-        text = text:gsub(("{%s}"):format(placeholder), tostring(result))
+        text = text:gsub(("{%s}"):format(placeholder), (tostring(result):gsub("%%", "%%%%")))
     end
     return text
 end
 
 function Adjustments:DiscordPresence()
     if Config.DiscordActivity.appId ~= 0 then
         CreateThread(function()
-            while true do
+            while ESX.PlayerLoaded do
                 SetDiscordAppId(Config.DiscordActivity.appId)
                 SetRichPresence(self:ReplacePlaceholders(Config.DiscordActivity.presence))
                 SetDiscordRichPresenceAsset(Config.DiscordActivity.assetName)
@@ -213,7 +215,9 @@ function Adjustments:WantedLevel()
 end
 
 function Adjustments:DisableRadio()
-    if Config.RemoveHudComponents[16] then
+    if Config.RemoveHudComponents[16] and not self.disableRadioRegistered then
+        self.disableRadioRegistered = true
+
         AddEventHandler("esx:enteredVehicle", function(vehicle, plate, seat, displayName, netId)
             SetVehRadioStation(vehicle,"OFF")
             SetUserRadioControlEnabled(false)
@@ -223,7 +227,7 @@ end
 
 function Adjustments:Multipliers()
     CreateThread(function()
-        while true do
+        while ESX.PlayerLoaded do
             SetPedDensityMultiplierThisFrame(Config.Multipliers.pedDensity)
             SetScenarioPedDensityMultiplierThisFrame(Config.Multipliers.scenarioPedDensityInterior, Config.Multipliers.scenarioPedDensityExterior)
             SetAmbientVehicleRangeMultiplierThisFrame(Config.Multipliers.ambientVehicleRange)

[core]/es_extended/client/modules/callback.lua

@@ -102,7 +102,7 @@ function ESX.AwaitServerCallback(eventName, ...)
 
     -- if the server callback takes longer than 15 seconds to respond, reject the promise
     SetTimeout(15000, function()
-        if p.state == "pending" then
+        if p.state == 0 then
             p:reject("Server Callback Timed Out")
         end
     end)

[core]/es_extended/client/modules/events.lua

@@ -372,7 +372,6 @@ if not Config.CustomInventory then
         while true do
             local Sleep = 1500
             local playerCoords = GetEntityCoords(ESX.PlayerData.ped)
-            local _, closestDistance = ESX.Game.GetClosestPlayer(playerCoords)
 
             for pickupId, pickup in pairs(pickups) do
                 local distance = #(playerCoords - pickup.coords)
@@ -383,6 +382,8 @@ if not Config.CustomInventory then
 
                     if distance < 1 then
                         if IsControlJustReleased(0, 38) then
+                            local _, closestDistance = ESX.Game.GetClosestPlayer(playerCoords)
+
                             if IsPedOnFoot(ESX.PlayerData.ped) and (closestDistance == -1 or closestDistance > 3) and not pickup.inRange then
                                 pickup.inRange = true
 

[core]/es_extended/fxmanifest.lua

@@ -3,7 +3,7 @@ fx_version 'cerulean'
 game 'gta5'
 description 'The Core resource that provides the functionalities for all other resources.'
 lua54 'yes'
-version '1.14.0'
+version '1.14.1'
 
 shared_scripts {
 	'@esx_lib/imports.lua',

[core]/es_extended/locale.lua

@@ -82,7 +82,7 @@ function Translate(str, ...) -- Translate string
 end
 
 function TranslateCap(str, ...) -- Translate string first char uppercase
-    return _(str, ...):gsub("^%l", string.upper)
+    return (_(str, ...):gsub("^%l", string.upper))
 end
 
 _ = Translate