Revert "Revert "Merge branch 'main' of https://github.com/ThatGuyJacobee/Elite-Gaming-RP""

This reverts commit 78d2032f68b5ded0bc3775598a783e81770fbf10.

resources/Announcer/config.lua

@@ -13,12 +13,12 @@ config.prefix = '^*^8[Announcement] ^7'
 --===================================================================
 config.messages = {
     'CAD is a requirement on our server! You can join by heading to: cad.elite-gaming.co.uk',
-	'Join our discord for news and updates by using /discord! (discord.gg/2XvwvgR)',
+	'Join our discord for news and updates by using /discord! (discord.eguk.me)',
 	'Any suggestions are welcome to be shared at our Elite Gaming RP discord server!',	
 	'Want to apply for a job? Head over to: forum.elite-gaming.co.uk and apply for a role today!',
 	'Did you know we have over 50+ add-on interiors around the map!',
 	'Need help around the server? Head over to our discord to access the #server-faq channel which has useful guides!',
 	'The AOP can be found next to the minimap, which shows where the Area Of Patrol is currently located.'
 	'Server Status can be found on our discord through Elite Bot!'
-	'We have move EGRP into the main EGUK discord. Make sure to join the EGUK discord through: discord.gg/2XvwvgR'
+	'We have move EGRP into the main EGUK discord. Make sure to join the EGUK discord through: discord.eguk.me'
 }

resources/Custom-Commands/client.lua

@@ -11,7 +11,7 @@
 --------------------RESPONSE COMMANDS--------------------------
 
 RegisterCommand("discord", function(source, args, rawCommand) -------- replace "discord" with any other command you want **DON'T INCLUDE /**
-    TriggerEvent("chatMessage", "^*^8[Our Discord:] ^7https://discord.gg/2XvwvgR") ------- change message in the ""
+    TriggerEvent("chatMessage", "^*^8[Our Discord:] ^7discord.eguk.me") ------- change message in the ""
 end)
 
 --RegisterCommand("cad", function(source, args, rawCommand) ------- replace "cad" with any other command you want DON'T INCLUDE /

resources/Holograms/holograms.lua

@@ -38,7 +38,7 @@ function Holograms()
 				-- Spawn - Links
 		if GetDistanceBetweenCoords( -857.60, -411.40, 37.64, GetEntityCoords(GetPlayerPed(-1))) < 32.5 then
 			Draw3DText( -857.60, -411.40, 37.64  -1.400, "Our Socials:", 4, 0.2, 0.2)
-			Draw3DText( -857.60, -411.40, 37.64  -1.750, "Discord: discord.gg/2XvwvgR", 4, 0.15, 0.15)
+			Draw3DText( -857.60, -411.40, 37.64  -1.750, "Discord: discord.eguk.me", 4, 0.15, 0.15)
 			Draw3DText( -857.60, -411.40, 37.64  -2.050, "Website: elite-gaming.co.uk", 4, 0.15, 0.15)
 			Draw3DText( -857.60, -411.40, 37.64  -2.350, "CAD: cad.elite-gaming.co.uk", 4, 0.15, 0.15)
 			Draw3DText( -857.60, -411.40, 37.64  -2.650, "Forum: forum.elite-gaming.co.uk", 4, 0.15, 0.15)

resources/[EGRP-Discord-Integration]/DiscordAcePerms/config.lua

@@ -1,6 +1,6 @@
 Config = {
 	Server_Name = "[Elite Gaming RP]",
-	Discord_Link = 'https://discord.gg/2XvwvgR',
+	Discord_Link = 'http://discord.eguk.me',
 	Website_Link = 'https://elite-gaming.co.uk',
 	roleList = {
 		{538822780662054963, "group.helper"}, --Helper role

resources/guidehud/config.js

@@ -16,7 +16,7 @@ var config = {
   // Change Discord settings and link.
   'discord': {
     'show': true,
-    'discordLink': 'discord.gg/2XvwvgR',
+    'discordLink': 'discord.eguk.me',
   },
   // Change which key you have set in guidehud/client/client.lua
   'menuHotkey': 'F1',
@@ -49,7 +49,7 @@ var guidelines = [
   'Not all rules can be listed so use common sense when playing.',
   'Minor rules may be superseded by excellent role-play as determined by Staff.',
   'AOP (Area of Roleplay) may be changed at any time, you must comply with it.',
-  'Join our discord: discord.gg/2UBSFv3 for more information and mod request ect.',
+  'Join our discord: discord.eguk.me for more information and mod request ect.',
   'Join our CAD: https://elite-gaming.co.uk and select CAD (OR cad.elite-gaming.co.uk)! This is manditory, not optional!',
   'Vote for us to help us grow: https://www.trackyserver.com/server/315407',
 ]

resources/vMenu/config/permissions.cfg

@@ -50,7 +50,7 @@ setr vmenu_quit_session_in_rockstar_editor false
 # Keep it short though, because the description box's size is limited.
 # The second convar is for the url/domain name of your community, which will be displayed as a label on
 # the right side of the info button. examples: https://www.vespura.com/hi/i/2018-12-09_23-43_9b003_349.png
-setr vmenu_server_info_message "About this server, Discord: discord.gg/2XvwvgR"
+setr vmenu_server_info_message "About this server, Discord: discord.eguk.me"
 setr vmenu_server_info_website_url "www.elite-gaming.co.uk"
 
 # Set the keybind that will be used for the 'teleport to waypoint' keybind 

resources/vannouncer/va_client.lua

@@ -3,11 +3,11 @@ local minutesBetweenAnnouncements = 20
 local prefix = "^1System:"
 local suffix = ""
 local messages = {
-    '^2Join our discord for updates & mod-requests: discord.gg/2UBSFv3!',
+    '^2Join our discord for updates & mod-requests: discord.eguk.me!',
     '^3Follow us on youtube and socials: Elite Gaming',
     '^4Check out our website: elite-gaming.co.uk',
     '^5Join our CAD, found on our website for a enhanced Roleplay experience!',
-    '^6Go check out our main discord server for extra content and custom bot: discord.gg/2XvwvgR.',
+    '^6Go check out our main discord server for extra content and custom bot: discord.eguk.me',
     '^8Any suggestions are welcome to be shared at our Elite Gaming RP discord server!'
 }
 local ignorelist = {