Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: nil value (global 'Config') #620

Merged
merged 1 commit into from
Jan 28, 2024
Merged

fix: nil value (global 'Config') #620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
18 changes: 1 addition & 17 deletions server-data/resources/[maps]/CayoTwoIslands/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. ---
}
4 changes: 1 addition & 3 deletions server-data/resources/[maps]/CayoTwoIslands/scripts/blips.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 },

Expand Down Expand Up @@ -35,4 +33,4 @@ Citizen.CreateThread(function()
AddTextComponentString(info.title)
EndTextCommandSetBlipName(info.blip)
end
end)
end)
2 changes: 1 addition & 1 deletion server-data/resources/[maps]/CayoTwoIslands/scripts/zones.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Config.zones = {
local zones = {
["AIRP"] = "Los Santos International Airport",
["ALAMO"] = "Alamo Sea",
["ALTA"] = "Alta",
Expand Down
Loading