From 96842b13208888ce4ed06d5ecd31a63ce780ca16 Mon Sep 17 00:00:00 2001 From: Jacob <42719082+ThatGuyJacobee@users.noreply.github.com> Date: Fri, 21 Oct 2022 00:01:36 +0100 Subject: [PATCH] Server Clean-Up + Removed a bunch of blips in order to prevent the limit bug. + Updated all database access with the new password. - Removed old event timetrial. --- resources/LegacyFuel/config.lua | 4 +- resources/RealisticVehicleFailure/config.lua | 2 +- resources/Timetrials/tracks.lua | 38 --- resources/cadvanced_mdt/cad.conf | 2 +- resources/ghmattimysql/config.json | 2 +- resources/vMenu/config/locations.json | 336 ------------------- server.cfg | 6 +- 7 files changed, 8 insertions(+), 382 deletions(-) diff --git a/resources/LegacyFuel/config.lua b/resources/LegacyFuel/config.lua index dfda1cb30..32101041a 100644 --- a/resources/LegacyFuel/config.lua +++ b/resources/LegacyFuel/config.lua @@ -20,8 +20,8 @@ Config.DisableKeys = {0, 22, 23, 24, 29, 30, 31, 37, 44, 56, 82, 140, 166, 167, Config.EnableHUD = false -- Configure blips here. Turn both to false to disable blips all together. -Config.ShowNearestGasStationOnly = false -Config.ShowAllGasStations = true +Config.ShowNearestGasStationOnly = true +Config.ShowAllGasStations = false -- Modify the fuel-cost here, using a multiplier value. Setting the value to 2.0 would cause a doubled increase. Config.CostMultiplier = 1.0 diff --git a/resources/RealisticVehicleFailure/config.lua b/resources/RealisticVehicleFailure/config.lua index 836debd27..290bb1850 100644 --- a/resources/RealisticVehicleFailure/config.lua +++ b/resources/RealisticVehicleFailure/config.lua @@ -42,7 +42,7 @@ cfg = { sundayDriverAcceleratorCurve = 7.5, -- The response curve to apply to the accelerator. Range 0.0 to 10.0. Higher values enables easier slow driving, meaning more pressure on the throttle is required to accelerate forward. Does nothing for keyboard drivers sundayDriverBrakeCurve = 5.0, -- The response curve to apply to the Brake. Range 0.0 to 10.0. Higher values enables easier braking, meaning more pressure on the throttle is required to brake hard. Does nothing for keyboard drivers - displayBlips = true, -- Show blips for mechanics locations + displayBlips = false, -- Show blips for mechanics locations compatibilityMode = false, -- prevents other scripts from modifying the fuel tank health to avoid random engine failure with BVA 2.01 (Downside is it disabled explosion prevention) diff --git a/resources/Timetrials/tracks.lua b/resources/Timetrials/tracks.lua index 5394bfc55..f1a878694 100644 --- a/resources/Timetrials/tracks.lua +++ b/resources/Timetrials/tracks.lua @@ -482,43 +482,5 @@ races = { { x = 1164.5404052734, y = 918.81359863282, z = 150.2805633545, heading = 138.49966430664, type = 7 }, { x = 1079.446899414, y = 776.37188720704, z = 153.45388793946, heading = 149.79602050782, type = 10 } } - }, - { - title = "Race | Timetrial Event - 04/04/21", - isEnabled = true, - showWaypoints = false, - checkpointRadius = 24.0, - checkpointTransparency = 1.0, - mapBlipId = 315, - mapBlipColor = 25, - start = { x = -2307.84, y = 428.75, z = 174.47, heading = 352.45, type = 7 }, - checkpoints = { - {x = -2280.51, y = 539.18, z = 172.56, heading = 322.86, type = 7}, - {x = -2195.88, y = 556.42, z = 160.03, heading = 220.24, type = 7}, - {x = -2142.71, y = 402.35, z = 136.29, heading = 189.18, type = 7}, - {x = -2045.44, y = 191.35, z = 114.83, heading = 221.37, type = 7}, - {x = -1895.73, y = 78.80, z = 84.20, heading = 234.00, type = 7}, - {x = -1806.55, y = 73.08, z = 71.45, heading = 318.72, type = 7}, - {x = -1705.91, y = 94.16, z = 65.31, heading = 297.60, type = 7}, - {x = -1584.76, y = 52.55, z = 59.74, heading = 251.83, type = 7}, - {x = -1454.02, y = 57.68, z = 52.50, heading = 270.85, type = 7}, - {x = -1419.56, y = -46.48, z = 53.25, heading = 195.28, type = 7}, - {x = -1328.63, y = -40.93, z = 49.46, heading = 354.32, type = 7}, - {x = -1389.23, y = 21.85, z = 53.49, heading = 6.83, type = 7}, - {x = -1399.26, y = 111.32, z = 54.05, heading = 351.46, type = 7}, - {x = -1370.45, y = 162.50, z = 57.61, heading = 283.36, type = 7}, - {x = -1236.74, y = 191.66, z = 63.51, heading = 273.46, type = 7}, - {x = -1158.31, y = 171.38, z = 63.33, heading = 209.85, type = 7}, - {x = -1155.29, y = 116.04, z = 59.56, heading = 216.66, type = 7}, - {x = -1104.03, y = 14.78, z = 49.79, heading = 209.06, type = 7}, - {x = -952.57, y = -152.07, z = 36.81, heading = 284.27, type = 7}, - {x = -892.59, y = -90.79, z = 36.81, heading = 22.85, type = 7}, - {x = -1001.44, y = 77.88, z = 50.90, heading = 31.57, type = 7}, - {x = -1081.16, y = 289.95, z = 62.98, heading = 356.39, type = 7}, - {x = -1093.04, y = 453.77, z = 76.15, heading = 56.25, type = 7}, - {x = -1288.05, y = 461.47, z = 95.65, heading = 95.65, type = 7}, - {x = -1429.55, y = 475.74, z = 109.84, heading = 152.53, type = 7}, - {x = -1445.26, y = 401.96, z = 110.32, heading = 190.97, type = 10} - } } } diff --git a/resources/cadvanced_mdt/cad.conf b/resources/cadvanced_mdt/cad.conf index 975d6907a..a99111878 100644 --- a/resources/cadvanced_mdt/cad.conf +++ b/resources/cadvanced_mdt/cad.conf @@ -1,2 +1,2 @@ ###### IMPORTANT CONFIGURATION FILE - DO NOT EDIT OR DELETE ###### -https://cad.elite-gaming.co.uk|7e6c2768-be46-47ca-9437-96a526593de9 \ No newline at end of file +https://cad.elite-gaming.co.uk|692c758a-1eb8-472f-a79e-b7cc8a30618c \ No newline at end of file diff --git a/resources/ghmattimysql/config.json b/resources/ghmattimysql/config.json index 1065f80eb..3bb747360 100644 --- a/resources/ghmattimysql/config.json +++ b/resources/ghmattimysql/config.json @@ -1,6 +1,6 @@ { "user": "root", - "password": "Martyniak_13", + "password": "Elite_Gaming_13", "host": "localhost", "port": 3306, "database": "fivem", diff --git a/resources/vMenu/config/locations.json b/resources/vMenu/config/locations.json index d477bca4a..ca0dcd3c3 100644 --- a/resources/vMenu/config/locations.json +++ b/resources/vMenu/config/locations.json @@ -1021,90 +1021,6 @@ "spriteID": 93, "color": 61 }, - { - "name": "Safehouse", - "coordinates": { - "X": -818.05, - "Y": 177.76, - "Z": 72.22, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 40, - "color": 39 - }, - { - "name": "Safehouse", - "coordinates": { - "X": 1985.481, - "Y": 3828.768, - "Z": 32.5, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 40, - "color": 39 - }, - { - "name": "Safehouse", - "coordinates": { - "X": -1117.163, - "Y": 303.0907, - "Z": 66.52217, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 40, - "color": 39 - }, - { - "name": "Safehouse", - "coordinates": { - "X": 1395.17, - "Y": 1141.81, - "Z": 114.63, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 40, - "color": 39 - }, - { - "name": "Safehouse", - "coordinates": { - "X": 5.09, - "Y": 532.59, - "Z": 175.34, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 40, - "color": 39 - }, - { - "name": "Safehouse", - "coordinates": { - "X": -14.69, - "Y": -1439.27, - "Z": 31.1, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 40, - "color": 39 - }, - { - "name": "Safehouse", - "coordinates": { - "X": -3086.428, - "Y": 339.2523, - "Z": 6.3717, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 40, - "color": 39 - }, { "name": "Jewel Store", "coordinates": { @@ -1237,138 +1153,6 @@ "spriteID": 455, "color": 0 }, - { - "name": "Bunker", - "coordinates": { - "X": 848.0, - "Y": 3004.0, - "Z": 44.0, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 473, - "color": 55 - }, - { - "name": "Bunker", - "coordinates": { - "X": 2118.0, - "Y": 3330.0, - "Z": 46.0, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 473, - "color": 55 - }, - { - "name": "Bunker", - "coordinates": { - "X": 2491.0, - "Y": 3150.0, - "Z": 50.0, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 473, - "color": 55 - }, - { - "name": "Bunker", - "coordinates": { - "X": 486.0, - "Y": 3005.0, - "Z": 42.0, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 473, - "color": 55 - }, - { - "name": "Bunker", - "coordinates": { - "X": -391.0, - "Y": 4354.0, - "Z": 57.0, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 473, - "color": 55 - }, - { - "name": "Bunker", - "coordinates": { - "X": 1815.0, - "Y": 4706.0, - "Z": 41.0, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 473, - "color": 55 - }, - { - "name": "Bunker", - "coordinates": { - "X": 1571.0, - "Y": 2241.0, - "Z": 79.0, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 473, - "color": 55 - }, - { - "name": "Bunker", - "coordinates": { - "X": -772.0, - "Y": 5938.0, - "Z": 23.0, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 473, - "color": 55 - }, - { - "name": "Bunker", - "coordinates": { - "X": 31.0, - "Y": 2945.0, - "Z": 58.0, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 473, - "color": 55 - }, - { - "name": "Bunker", - "coordinates": { - "X": -3046.0, - "Y": 3331.0, - "Z": 11.0, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 473, - "color": 55 - }, - { - "name": "Bunker", - "coordinates": { - "X": -3171.0, - "Y": 1375.0, - "Z": 18.0, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 473, - "color": 55 - }, { "name": "Bahama Mamas", "coordinates": { @@ -1380,66 +1164,6 @@ }, "spriteID": 93, "color": 0 - }, - { - "name": "Aircraft Hangar", - "coordinates": { - "X": -1152.17, - "Y": -3410.83, - "Z": 13.95, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 359, - "color": 62 - }, - { - "name": "Aircraft Hangar", - "coordinates": { - "X": -1395.4, - "Y": -3266.66, - "Z": 13.95, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 359, - "color": 62 - }, - { - "name": "Aircraft Hangar", - "coordinates": { - "X": -2470.22, - "Y": 3274.79, - "Z": 32.83, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 359, - "color": 62 - }, - { - "name": "Aircraft Hangar", - "coordinates": { - "X": -2021.5, - "Y": 3157.4, - "Z": 32.81, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 359, - "color": 62 - }, - { - "name": "Aircraft Hangar", - "coordinates": { - "X": -1878.01, - "Y": 3108.85, - "Z": 32.81, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 359, - "color": 62 }, { "name": "Add-On | Racetrack", @@ -1524,18 +1248,6 @@ }, "spriteID": 417, "color": 32 - }, - { - "name": "Add-On | Map", - "coordinates": { - "X": 972.19, - "Y": -41.74, - "Z": 75.92, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 417, - "color": 32 }, { "name": "Add-On | Map", @@ -1572,18 +1284,6 @@ }, "spriteID": 417, "color": 32 - }, - { - "name": "Add-On | Map", - "coordinates": { - "X": -324.04, - "Y": -1967.69, - "Z": 29.95, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 417, - "color": 32 }, { "name": "Add-On | Map", @@ -1896,18 +1596,6 @@ }, "spriteID": 417, "color": 32 - }, - { - "name": "Add-On | Map", - "coordinates": { - "X": 1554.67, - "Y": 829.39, - "Z": 77.66, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 417, - "color": 32 }, { "name": "Add-On | Map", @@ -2052,30 +1740,6 @@ }, "spriteID": 417, "color": 32 - }, - { - "name": "Add-On | Map", - "coordinates": { - "X": 835.16, - "Y": -1299.25, - "Z": 36.37, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 417, - "color": 32 - }, - { - "name": "Add-On | Map", - "coordinates": { - "X": 379.35, - "Y": -1605.22, - "Z": 39.85, - "IsNormalized": false, - "IsZero": false - }, - "spriteID": 417, - "color": 32 }, { "name": "Add-On | Map", diff --git a/server.cfg b/server.cfg index e22d2c84d..b18cf126a 100644 --- a/server.cfg +++ b/server.cfg @@ -25,8 +25,8 @@ start ghmattimysql start mysql-async start oxmysql -set mysql_connection_string "server=localhost;uid=root;password=Martyniak_13;database=fivem" -//set mysql_connection_string "server=localhost;uid=root;password=Martyniak_13;database=elitebot" +set mysql_connection_string "server=localhost;uid=root;password=Elite_Gaming_13;database=fivem" +//set mysql_connection_string "server=localhost;uid=root;password=Elite_Gaming_13;database=elitebot" #[-----Scripts With MySQL-----] start police @@ -37,6 +37,7 @@ start rp-radio start RadioList start pe-core +start RichPresence start npwd #[-----Server Scripts-----] @@ -48,7 +49,6 @@ start guidehud start EGRP-LoadingScreen start NeverWanted start PvP -start RichPresence start Disable-Dispatch start Commands start Tow-Command