Merge pull request #620 from bitpredator/dev

fix: nil value (global 'Config')
bitpredator · Jan 28, 2024 · 9ffb261 · 9ffb261
2 parents 41a3fd3 + fbaf14e
commit 9ffb261
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 22 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -103,4 +103,5 @@ fix lint error: unused argument last; accessing undefined variable Invoke; unuse
 77. [esx_notify]: refactor: formatting(all): Format with prettier and lua formatter @bitpredator
 78. [esx_progressbar]: refactor: formatting(all): Format with prettier and lua formatter @bitpredator
 79. [esx_society]: refactor: (esx_society):  complete rebuild for esx_society @bitpredator
-80. [npwd]: fix: database error npwd @bitpredator
+80. [npwd]: fix: database error npwd @bitpredator
+81. [CayoTwoIslands]: fix: nil value (global 'Config') @bitpredator
diff --git a/server-data/resources/[maps]/CayoTwoIslands/fxmanifest.lua b/server-data/resources/[maps]/CayoTwoIslands/fxmanifest.lua
@@ -14,26 +14,10 @@ data_file 'DLC_ITYP_REQUEST' 'stream/ytyp/mads_no_exp_pumps.ytyp' -- Stops petro
 
 client_scripts {
     'scripts/twoislands.lua', -- Both Islands Visible At One Time
-
     'scripts/cayo_perico_entitysets.lua', -- Responsible for spawning in heist props in El Rubio's Mansion safe. You can use this file to change the prop that appears.
-
     'scripts/blips.lua', -- Map Blips
-
     'scripts/zones.lua', -- Displays all map zones, fixing the 'bug' of showing North Yankton, and instead, showing Cayo Perico
-
     'scripts/peds_config.lua', -- Invincible peds that appear on the island, ie merryweather
-
     'scripts/main_peds.lua', -- Don't touch this
-
     'scripts/static_emitters.lua' -- Disables annoying 'cheering' SFXs from Arena Wars location near North Yankton / Cayo Perico
-
-}
-
-
-
----                                                                     ---
----   THIS IS A FREE RESOURCE PROVIDED TO CFXRE FORUMS FOR FIVEM USAGE   ---
----        DO NOT REUPLOAD OR MODIFY WITHOUT MY PERMISSION               ---
----        DO NOT CONVERT FOR SINGLE PLAYER USAGE WITHOUT MY PERMISSION  ---
----    YOU CAN COMMENT OUT PEDS AND TELEPORTERS IF YOU WISH TO          ---
----    DO NOT DM ME FOR ONE ON ONE SUPPORT.                             ---
+}
diff --git a/server-data/resources/[maps]/CayoTwoIslands/scripts/blips.lua b/server-data/resources/[maps]/CayoTwoIslands/scripts/blips.lua
@@ -1,10 +1,8 @@
 local blips = {
     -- Airports --
-
     { title = "Cayo Perico Runway", colour = 3, id = 90, x = 3961.97, y = -4689.05, z = 3.6 },
 
     -- Cayo Perico Island Blips --
-
     -- Island Beach Party
     { title = "Island Beach Party", colour = 23, id = 614, x = 4918.11, y = -4906.8, z = 3.44 },
 
@@ -35,4 +33,4 @@ Citizen.CreateThread(function()
         AddTextComponentString(info.title)
         EndTextCommandSetBlipName(info.blip)
     end
-end)
+end)
diff --git a/server-data/resources/[maps]/CayoTwoIslands/scripts/zones.lua b/server-data/resources/[maps]/CayoTwoIslands/scripts/zones.lua
@@ -1,4 +1,4 @@
-Config.zones = {
+local zones = {
     ["AIRP"] = "Los Santos International Airport",
     ["ALAMO"] = "Alamo Sea",
     ["ALTA"] = "Alta",