Merge pull request #560 from bitpredator/dev

fix: removed unused variables
bitpredator · Nov 17, 2023 · 7051ba7 · 7051ba7
2 parents 0fde1e4 + b5e6bf3
commit 7051ba7
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 38 deletions.
diff --git 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
+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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/server-data/resources/[esx]/mythic_notify/fxmanifest.lua b/server-data/resources/[esx]/mythic_notify/fxmanifest.lua
@@ -1,16 +1,16 @@
 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',
 }
 
 files {
 	'html/ui.html',
-	'html/js/app.js', 
+	'html/js/app.js',
 	'html/css/style.css',
 }
 
@@ -22,4 +22,4 @@ exports {
 	'SendAlert',
 	'SendUniqueAlert',
 	'PersistentAlert',
-}
+}