diff --git a/[esx_addons]/esx_whitelist/LICENSE b/[esx_addons]/esx_allowlist/LICENSE similarity index 100% rename from [esx_addons]/esx_whitelist/LICENSE rename to [esx_addons]/esx_allowlist/LICENSE diff --git a/[esx_addons]/esx_allowlist/README.md b/[esx_addons]/esx_allowlist/README.md new file mode 100644 index 00000000..010ba7e4 --- /dev/null +++ b/[esx_addons]/esx_allowlist/README.md @@ -0,0 +1,16 @@ +

[ESX] Allowlist

Discord - Website - Documentation + +block those evil intruders with ESX Allowlist! +This Script allows you to block all players from joining and specify the only players who can join! + +## Legal + +esx_allowlist- block those evil intruders! + +Copyright (C) 2022 ESX-Framework + +This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. + +This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details. + +You should have received a copy Of the GNU General Public License along with this program. If Not, see . diff --git a/[esx_addons]/esx_whitelist/config.lua b/[esx_addons]/esx_allowlist/config.lua similarity index 100% rename from [esx_addons]/esx_whitelist/config.lua rename to [esx_addons]/esx_allowlist/config.lua diff --git a/[esx_addons]/esx_whitelist/fxmanifest.lua b/[esx_addons]/esx_allowlist/fxmanifest.lua similarity index 100% rename from [esx_addons]/esx_whitelist/fxmanifest.lua rename to [esx_addons]/esx_allowlist/fxmanifest.lua diff --git a/[esx_addons]/esx_whitelist/locales/br.lua b/[esx_addons]/esx_allowlist/locales/br.lua similarity index 100% rename from [esx_addons]/esx_whitelist/locales/br.lua rename to [esx_addons]/esx_allowlist/locales/br.lua diff --git a/[esx_addons]/esx_whitelist/locales/en.lua b/[esx_addons]/esx_allowlist/locales/en.lua similarity index 100% rename from [esx_addons]/esx_whitelist/locales/en.lua rename to [esx_addons]/esx_allowlist/locales/en.lua diff --git a/[esx_addons]/esx_whitelist/locales/es.lua b/[esx_addons]/esx_allowlist/locales/es.lua similarity index 100% rename from [esx_addons]/esx_whitelist/locales/es.lua rename to [esx_addons]/esx_allowlist/locales/es.lua diff --git a/[esx_addons]/esx_whitelist/locales/fr.lua b/[esx_addons]/esx_allowlist/locales/fr.lua similarity index 100% rename from [esx_addons]/esx_whitelist/locales/fr.lua rename to [esx_addons]/esx_allowlist/locales/fr.lua diff --git a/[esx_addons]/esx_whitelist/locales/hu.lua b/[esx_addons]/esx_allowlist/locales/hu.lua similarity index 100% rename from [esx_addons]/esx_whitelist/locales/hu.lua rename to [esx_addons]/esx_allowlist/locales/hu.lua diff --git a/[esx_addons]/esx_whitelist/locales/si.lua b/[esx_addons]/esx_allowlist/locales/si.lua similarity index 100% rename from [esx_addons]/esx_whitelist/locales/si.lua rename to [esx_addons]/esx_allowlist/locales/si.lua diff --git a/[esx_addons]/esx_whitelist/locales/sv.lua b/[esx_addons]/esx_allowlist/locales/sv.lua similarity index 100% rename from [esx_addons]/esx_whitelist/locales/sv.lua rename to [esx_addons]/esx_allowlist/locales/sv.lua diff --git a/[esx_addons]/esx_whitelist/locales/tr.lua b/[esx_addons]/esx_allowlist/locales/tr.lua similarity index 100% rename from [esx_addons]/esx_whitelist/locales/tr.lua rename to [esx_addons]/esx_allowlist/locales/tr.lua diff --git a/[esx_addons]/esx_whitelist/players.json b/[esx_addons]/esx_allowlist/players.json similarity index 100% rename from [esx_addons]/esx_whitelist/players.json rename to [esx_addons]/esx_allowlist/players.json diff --git a/[esx_addons]/esx_whitelist/server/main.lua b/[esx_addons]/esx_allowlist/server/main.lua similarity index 92% rename from [esx_addons]/esx_whitelist/server/main.lua rename to [esx_addons]/esx_allowlist/server/main.lua index 8f482a90..bed3912b 100644 --- a/[esx_addons]/esx_whitelist/server/main.lua +++ b/[esx_addons]/esx_allowlist/server/main.lua @@ -18,7 +18,7 @@ AddEventHandler('playerConnecting', function(name, setCallback, deferrals) -- Mark this connection as deferred, this is to prevent problems while checking player identifiers. deferrals.defer() - local playerId, kickReason = source + local playerId, kickReason = source, "There Was An Error, Please Contact the server owner!" -- Letting the user know what's going on. deferrals.update(_U('whitelist_check')) @@ -44,10 +44,9 @@ AddEventHandler('playerConnecting', function(name, setCallback, deferrals) end end) -ESX.RegisterCommand('wlrefresh', 'admin', function(xPlayer, args, showError) - loadWhiteList(function() - showError('Whitelist reloaded') - end) +ESX.RegisterCommand('wlrefresh', 'admin', function(xPlayer, args) + loadWhiteList() + print('[esx_whitelist] Whitelist Refreshed!') end, true, {help = _U('help_whitelist_load')}) ESX.RegisterCommand('wladd', 'admin', function(xPlayer, args, showError) diff --git a/[esx_addons]/esx_whitelist/.editorconfig b/[esx_addons]/esx_whitelist/.editorconfig deleted file mode 100644 index 9b425256..00000000 --- a/[esx_addons]/esx_whitelist/.editorconfig +++ /dev/null @@ -1,9 +0,0 @@ -root = true - -[*] -indent_size = 4 -indent_style = tab -end_of_line = crlf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true \ No newline at end of file diff --git a/[esx_addons]/esx_whitelist/README.md b/[esx_addons]/esx_whitelist/README.md deleted file mode 100644 index 9ea7a128..00000000 --- a/[esx_addons]/esx_whitelist/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# esx_whitelist - -# Legal -esx_whitelist - Whitelist script - -Copyright (C) 2015-2022 Jérémie N'gadi - -This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. - -This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details. - -You should have received a copy Of the GNU General Public License along with this program. If Not, see http://www.gnu.org/licenses/. \ No newline at end of file