Merge pull request #2 from Itz-Hyperz/main

I guess just push it and see what happens, I really was just bored lmao
Jordan2139 · Feb 10, 2021 · 7a2c6e0 · 7a2c6e0
2 parents c553592 + b252bbf
commit 7a2c6e0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/config.lua b/config.lua
@@ -1,6 +1,6 @@
------------------------------------------------------------
--- Guardian- A Simple FiveM Script, Made By Jordan.#2139 --
------------------------------------------------------------
+--------------------------------------------------------------------------------------------
+-- Guardian- A Far More Advanced FiveM Script Than DiscordWhitelist, Made By Jordan.#2139 --
+--------------------------------------------------------------------------------------------
 
 -------------------------------------------------------
 --           CONFIG YOUR PERIPHERALS HERE!           --
@@ -9,12 +9,13 @@ Config = {
 DiscordYeet = 'Sorry but this server reqiures you to have Discord (Desktop Edition) to play. Please restart FiveM and Discord if it is already open!', -- Message to client if their discord cannot be found by the script
 WhitelistYeet = 'Sorry but this is a whitelisted community if you would like to join please see our website- WEBSITE to apply!', -- Message to client if they are not whitelisted
 RoleIdsYeet = 'Sorry but I could not find your role ID\'s please reconnect and if this persists please contact the server developer!',
-WhitelistRoles = { -- Roles that you assigned in Badgers API that should pass the whitelist
+ServerName = 'New Orleans Roleplay',
+WhitelistRoles = { -- Roles that you assigned in Badgers API that should pass the whitelist, ALSO Make sure that **each** role ends with a comma!
     "Whitelisted",
     "MaybeWhitelisted",
     "ScrewItMakeThis",
 },
 }
 --------------------------
 -- ^^^ DO THAT HERE ^^^ -- 
---------------------------
+--------------------------
diff --git a/server.lua b/server.lua
@@ -1,6 +1,6 @@
------------------------------------------------------------
--- Guardian- A Simple FiveM Script, Made By Jordan.#2139 --
------------------------------------------------------------
+--------------------------------------------------------------------------------------------
+-- Guardian- A Far More Advanced FiveM Script Than DiscordWhitelist, Made By Jordan.#2139 --
+--------------------------------------------------------------------------------------------
 
 ----------------------------------------------------------------------------------------------
                   -- !WARNING! !WARNING! !WARNING! !WARNING! !WARNING! --
@@ -31,7 +31,7 @@ AddEventHandler("playerConnecting", function(name, setCallback, deferrals)
     deferrals.defer()
     local src = source
     local identifierDiscord = "";
-    deferrals.update("Checking Whitelist Permissions")
+    deferrals.update("Checking Whitelist Permissions For " Config.ServerName)
 
     Citizen.Wait(0); -- Necessary Citizen.Wait() before deferrals.done()
 
@@ -48,6 +48,7 @@ AddEventHandler("playerConnecting", function(name, setCallback, deferrals)
                         for j = 1, #roleIDs do
                             if exports.Badger_Discord_API:CheckEqual(roleList[i], roleIDs[j]) then
                                 print("[Guardian] (playerConnecting) Allowing " .. GetPlayerName(src) .. " to join with the role "  .. roleList[i])
+				print("[Guardian] (playerConnecting) Player " .. GetPlayerName(src) .. "  Attempted to connect with Guardian, They were allowed entry")
                                 isWhitelisted = true;
                             else
                                 if isWhitelisted == false then 
@@ -58,12 +59,14 @@ AddEventHandler("playerConnecting", function(name, setCallback, deferrals)
                     end
                 else
                     print("[Guardian] (playerConnecting) Player " .. GetPlayerName(src) .. "  Could not connect because role id\'s were not present")
+		    print("[Guardian] (playerConnecting) Player " .. GetPlayerName(src) .. "  Attempted to connect with Guardian, however they failed")
                     deferrals.done(Config.RoleIdsYeet)
                     CancelEvent()
                     return;
                 end
             else
                 print("[Guardian] (playerConnecting) Declined connection from " .. GetPlayerName(src) .. "  because they did not have Discord open")
+		print("[Guardian] (playerConnecting) Player " .. GetPlayerName(src) .. "  Attempted to connect with Guardian, however they failed")
                 deferrals.done(Config.DiscordYeet)
                 CancelEvent()
                 return;

diff --git a/version_check.lua b/version_check.lua
@@ -1,6 +1,6 @@
------------------------------------------------------------
--- Guardian- A Simple FiveM Script, Made By Jordan.#2139 --
------------------------------------------------------------
+--------------------------------------------------------------------------------------------
+-- Guardian- A Far More Advanced FiveM Script Than DiscordWhitelist, Made By Jordan.#2139 --
+--------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------------------
                   -- !WARNING! !WARNING! !WARNING! !WARNING! !WARNING! --
         -- DO NOT TOUCH THIS FILE OR YOU /WILL/ FUCK SHIT UP! EDIT THE CONFIG.LUA --