diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index a3bd0c59e..2a8582f78 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -42,4 +42,8 @@ 17. [esx_addoninventory]: delete: removed the .editorconfig file @bitpredator 18. [ox_inventory]: fix: corrected the weight of the items @bitpredator 19. [esx_identity]: chore: update the code version and improve the formatting @bitpredator -20. [esx_addons]: fix: replace bpt_realisticvehicle with esx_RealisticVehicleFailure to fix repair issues @bitpredator \ No newline at end of file +20. [esx_addons]: fix: replace bpt_realisticvehicle with esx_RealisticVehicleFailure to fix repair issues @bitpredator +21. [bpt_streetfight]: chore: clean up the code @bitpredator +22. [bpt_farmer]: chore: clean up the code @bitpredator +23. [bpt_teleport]: chore: clean up the code @bitpredator +24. [mythic_notify]: fix: removed unused variables @bitpredator \ No newline at end of file diff --git a/server-data/resources/[bpt_addons]/bpt_farmer/client/main.lua b/server-data/resources/[bpt_addons]/bpt_farmer/client/main.lua index 6d77de3cb..6f487c894 100644 --- a/server-data/resources/[bpt_addons]/bpt_farmer/client/main.lua +++ b/server-data/resources/[bpt_addons]/bpt_farmer/client/main.lua @@ -10,7 +10,6 @@ local Keys = { ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 } -ESX = nil local incollect = false ESX = exports["es_extended"]:getSharedObject() diff --git a/server-data/resources/[bpt_addons]/bpt_farmer/server/main.lua b/server-data/resources/[bpt_addons]/bpt_farmer/server/main.lua index 4ded4fe42..b84776485 100644 --- a/server-data/resources/[bpt_addons]/bpt_farmer/server/main.lua +++ b/server-data/resources/[bpt_addons]/bpt_farmer/server/main.lua @@ -1,5 +1,5 @@ -ESX = nil ESX = exports["es_extended"]:getSharedObject() + -- collection potato RegisterServerEvent('farmer:collectionpotato') AddEventHandler('farmer:collectionpotato', function() diff --git a/server-data/resources/[bpt_addons]/bpt_streetfight/client/client.lua b/server-data/resources/[bpt_addons]/bpt_streetfight/client/client.lua index 28976d02e..9ecc01078 100644 --- a/server-data/resources/[bpt_addons]/bpt_streetfight/client/client.lua +++ b/server-data/resources/[bpt_addons]/bpt_streetfight/client/client.lua @@ -1,4 +1,3 @@ -ESX = nil local betAmount = 0 local fightStatus = false local STATUS_INITIAL = false diff --git a/server-data/resources/[bpt_addons]/bpt_streetfight/server/server.lua b/server-data/resources/[bpt_addons]/bpt_streetfight/server/server.lua index dd81a18c8..3709fbfae 100644 --- a/server-data/resources/[bpt_addons]/bpt_streetfight/server/server.lua +++ b/server-data/resources/[bpt_addons]/bpt_streetfight/server/server.lua @@ -1,5 +1,3 @@ -ESX = nil - local bluePlayerReady = false local redPlayerReady = false local fight = {} diff --git a/server-data/resources/[bpt_addons]/bpt_teleport/warehouses.lua b/server-data/resources/[bpt_addons]/bpt_teleport/warehouses.lua index f42bf8988..8630fa1c3 100644 --- a/server-data/resources/[bpt_addons]/bpt_teleport/warehouses.lua +++ b/server-data/resources/[bpt_addons]/bpt_teleport/warehouses.lua @@ -1,7 +1,4 @@ -ESX = nil -CreateThread(function() - ESX = exports["es_extended"]:getSharedObject() -end) +ESX = exports["es_extended"]:getSharedObject() CreateThread(function() while true do diff --git a/server-data/resources/[esx]/mythic_notify/client/depracated.lua b/server-data/resources/[esx]/mythic_notify/client/depracated.lua deleted file mode 100644 index b363b6499..000000000 --- a/server-data/resources/[esx]/mythic_notify/client/depracated.lua +++ /dev/null @@ -1,24 +0,0 @@ -RegisterNetEvent('mythic_notify:client:PersistentHudText') -AddEventHandler('mythic_notify:client:PersistentHudText', function(data) - PersistentAlert(data.action, data.id, data.type, data.text, data.style) -end) - -function DoShortHudText(type, text, style) - SendAlert(type, text, 1000, style) -end - -function DoHudText(type, text, style) - SendAlert(type, text, 2500, style) -end - -function DoLongHudText(type, text, style) - SendAlert(type, text, 5000, style) -end - -function DoCustomHudText(type, text, length, style) - SendAlert(type, text, length, style) -end - -function PersistentHudText(action, id, type, text, style) - PersistentAlert(action, id, type, text, style) -end \ No newline at end of file diff --git a/server-data/resources/[esx]/mythic_notify/fxmanifest.lua b/server-data/resources/[esx]/mythic_notify/fxmanifest.lua index 249491563..3aa7274a4 100644 --- a/server-data/resources/[esx]/mythic_notify/fxmanifest.lua +++ b/server-data/resources/[esx]/mythic_notify/fxmanifest.lua @@ -1,8 +1,8 @@ fx_version 'adamant' game 'gta5' name 'Mythic Framework Notification System' -author 'Alzar - https://github.com/Alzar' -version 'v1.1.0' + +version '1.0.0' ui_page { 'html/ui.html', @@ -10,7 +10,7 @@ ui_page { files { 'html/ui.html', - 'html/js/app.js', + 'html/js/app.js', 'html/css/style.css', } @@ -22,4 +22,4 @@ exports { 'SendAlert', 'SendUniqueAlert', 'PersistentAlert', -} +} \ No newline at end of file