diff --git a/LICENSE b/LICENSE index b2b6280b..c9f6259a 100644 --- a/LICENSE +++ b/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-es_extended - Copyright (C) 2015 Jérémie N'gadi + esx-legacy + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-es_extended Copyright (C) 2015 Jérémie N'gadi + esx-legacy Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/README.md b/README.md index 8138f44b..726aba2d 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ ESX was initially developed by Gizz back in 2017 for his friend as the were crea es_extended - ESX framework for FiveM -Copyright (C) 2015-2021 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx]/async/LICENSE b/[esx]/async/LICENSE index 0f4f5d61..3ca99747 100644 --- a/[esx]/async/LICENSE +++ b/[esx]/async/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-async - Copyright (C) 2015 Jérémie N'gadi + async + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-async Copyright (C) 2015 Jérémie N'gadi + async Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx]/cron/LICENSE b/[esx]/cron/LICENSE index d25a9795..29cc4574 100644 --- a/[esx]/cron/LICENSE +++ b/[esx]/cron/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-cron - Copyright (C) 2015 Jérémie N'gadi + cron + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-cron Copyright (C) 2015 Jérémie N'gadi + cron Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx]/cron/README.md b/[esx]/cron/README.md index a6d49ac0..ed1e3bda 100644 --- a/[esx]/cron/README.md +++ b/[esx]/cron/README.md @@ -43,7 +43,7 @@ TriggerEvent('cron:runAt', 18, 30, CronTask) ### License cron - do stuff in a specified time -Copyright (C) 2015-2018 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx]/es_extended/LICENSE b/[esx]/es_extended/LICENSE index b2b6280b..e7ea8b0e 100644 --- a/[esx]/es_extended/LICENSE +++ b/[esx]/es_extended/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-es_extended - Copyright (C) 2015 Jérémie N'gadi + es_extended + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-es_extended Copyright (C) 2015 Jérémie N'gadi + es_extended Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx]/es_extended/README.md b/[esx]/es_extended/README.md index 8138f44b..726aba2d 100644 --- a/[esx]/es_extended/README.md +++ b/[esx]/es_extended/README.md @@ -93,7 +93,7 @@ ESX was initially developed by Gizz back in 2017 for his friend as the were crea es_extended - ESX framework for FiveM -Copyright (C) 2015-2021 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx]/es_extended/client/main.lua b/[esx]/es_extended/client/main.lua index 340ffde6..c464139f 100644 --- a/[esx]/es_extended/client/main.lua +++ b/[esx]/es_extended/client/main.lua @@ -84,15 +84,13 @@ RegisterNetEvent('esx:setMaxWeight') AddEventHandler('esx:setMaxWeight', function(newMaxWeight) ESX.PlayerData.maxWeight = newMaxWeight end) AddEventHandler('esx:onPlayerSpawn', function() - local playerPed = PlayerPedId() - if ESX.PlayerData.ped ~= playerPed then ESX.SetPlayerData('ped', playerPed) end - if ESX.PlayerData.dead ~= false then ESX.SetPlayerData('dead', false) end + ESX.SetPlayerData('ped', PlayerPedId()) + ESX.SetPlayerData('dead', false) end) AddEventHandler('esx:onPlayerDeath', function() - local playerPed = PlayerPedId() - if ESX.PlayerData.ped ~= playerPed then ESX.SetPlayerData('ped', playerPed) end - if ESX.PlayerData.dead ~= false then ESX.SetPlayerData('dead', true) end + ESX.SetPlayerData('ped', PlayerPedId()) + ESX.SetPlayerData('dead', true) end) AddEventHandler('skinchanger:modelLoaded', function() @@ -103,8 +101,7 @@ AddEventHandler('skinchanger:modelLoaded', function() end) AddEventHandler('esx:restoreLoadout', function() - local playerPed = PlayerPedId() - if ESX.PlayerData.ped ~= playerPed then ESX.SetPlayerData('ped', playerPed) end + ESX.SetPlayerData('ped', PlayerPedId()) local ammoTypes = {} RemoveAllPedWeapons(ESX.PlayerData.ped, true) diff --git a/[esx]/esx_identity/LICENSE b/[esx]/esx_identity/LICENSE index 30ace6a8..6fb71ffc 100644 --- a/[esx]/esx_identity/LICENSE +++ b/[esx]/esx_identity/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} + esx_identity + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - {project} Copyright (C) {year} {fullname} + esx_identity Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx]/esx_identity/README.md b/[esx]/esx_identity/README.md index 2d466b10..8335e286 100644 --- a/[esx]/esx_identity/README.md +++ b/[esx]/esx_identity/README.md @@ -44,7 +44,7 @@ start esx_identity ### License esx_identity - rp characters -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx]/esx_menu_default/LICENSE b/[esx]/esx_menu_default/LICENSE index 3b39cdcf..085b4e27 100644 --- a/[esx]/esx_menu_default/LICENSE +++ b/[esx]/esx_menu_default/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_menu_default - Copyright (C) 2015 Jérémie N'gadi + esx_menu_default + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_menu_default Copyright (C) 2015 Jérémie N'gadi + esx_menu_default Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx]/esx_menu_dialog/LICENSE b/[esx]/esx_menu_dialog/LICENSE index 4a59a7ce..fe750f87 100644 --- a/[esx]/esx_menu_dialog/LICENSE +++ b/[esx]/esx_menu_dialog/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_menu_dialog - Copyright (C) 2015 Jérémie N'gadi + esx_menu_dialog + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_menu_dialog Copyright (C) 2015 Jérémie N'gadi + esx_menu_dialog Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx]/esx_menu_dialog/README.md b/[esx]/esx_menu_dialog/README.md index b10470a1..df9a896f 100644 --- a/[esx]/esx_menu_dialog/README.md +++ b/[esx]/esx_menu_dialog/README.md @@ -29,7 +29,7 @@ start esx_menu_dialog ### License esx_menu_dialog - input dialog for ESX -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx]/esx_menu_list/LICENSE b/[esx]/esx_menu_list/LICENSE index 8ec9ff7e..f258a3b7 100644 --- a/[esx]/esx_menu_list/LICENSE +++ b/[esx]/esx_menu_list/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_menu_list - Copyright (C) 2015 Jérémie N'gadi + esx_menu_list + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_menu_list Copyright (C) 2015 Jérémie N'gadi + esx_menu_list Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx]/esx_menu_list/README.md b/[esx]/esx_menu_list/README.md index 80093819..99c2f79c 100644 --- a/[esx]/esx_menu_list/README.md +++ b/[esx]/esx_menu_list/README.md @@ -29,7 +29,7 @@ start esx_menu_list ### License esx_menu_list - advanced menu inputs for ESX -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx]/esx_skin/LICENSE b/[esx]/esx_skin/LICENSE index ff506035..73d52ac8 100644 --- a/[esx]/esx_skin/LICENSE +++ b/[esx]/esx_skin/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_skin - Copyright (C) 2015 Jérémie N'gadi + esx_skin + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_skin Copyright (C) 2015 Jérémie N'gadi + esx_skin Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx]/esx_skin/README.md b/[esx]/esx_skin/README.md index 64e2b8fc..309bb0c0 100644 --- a/[esx]/esx_skin/README.md +++ b/[esx]/esx_skin/README.md @@ -32,7 +32,7 @@ start esx_skin ### License esx_skin - skin selector for ESX -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx]/skinchanger/LICENSE b/[esx]/skinchanger/LICENSE index 60fccac9..b087d524 100644 --- a/[esx]/skinchanger/LICENSE +++ b/[esx]/skinchanger/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-skinchanger - Copyright (C) 2015 Jérémie N'gadi + skinchanger + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-skinchanger Copyright (C) 2015 Jérémie N'gadi + skinchanger Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx]/skinchanger/README.md b/[esx]/skinchanger/README.md index 93583906..748ae6b9 100644 --- a/[esx]/skinchanger/README.md +++ b/[esx]/skinchanger/README.md @@ -94,7 +94,7 @@ end) ### License skinchanger - make your own skin! -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_accessories/LICENSE b/[esx_addons]/esx_accessories/LICENSE index e7d94eab..e6da8029 100644 --- a/[esx_addons]/esx_accessories/LICENSE +++ b/[esx_addons]/esx_accessories/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_mask - Copyright (C) 2015 Jérémie N'gadi + esx_accessories + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_mask Copyright (C) 2015 Jérémie N'gadi + esx_accessories Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_accessories/README.md b/[esx_addons]/esx_accessories/README.md index fe41849e..9dd93907 100644 --- a/[esx_addons]/esx_accessories/README.md +++ b/[esx_addons]/esx_accessories/README.md @@ -37,7 +37,7 @@ start esx_accessories ### License esx_accessories - buy some shiny stuff! -Copyright (C) 2015-2018 Lenaic Corbeau +Copyright (C) 2015-2021 Lenaic Corbeau 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. diff --git a/[esx_addons]/esx_accessories/client/main.lua b/[esx_addons]/esx_accessories/client/main.lua index 1cd80e2b..6974a4e0 100644 --- a/[esx_addons]/esx_accessories/client/main.lua +++ b/[esx_addons]/esx_accessories/client/main.lua @@ -2,6 +2,12 @@ local HasAlreadyEnteredMarker, isDead = false, false local LastZone, CurrentAction, CurrentActionMsg local CurrentActionData = {} +RegisterNetEvent('esx:playerLoaded') +AddEventHandler('esx:playerLoaded', function(xPlayer) + ESX.PlayerData = xPlayer + ESX.PlayerLoaded = true +end) + function OpenAccessoryMenu() ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'set_unset_accessory', { title = _U('set_unset'), diff --git a/[esx_addons]/esx_addonaccount/LICENSE b/[esx_addons]/esx_addonaccount/LICENSE index 3b348ed7..4ec26eb3 100644 --- a/[esx_addons]/esx_addonaccount/LICENSE +++ b/[esx_addons]/esx_addonaccount/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_addonaccount - Copyright (C) 2015 Jérémie N'gadi + esx_addonaccount + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_addonaccount Copyright (C) 2015 Jérémie N'gadi + esx_addonaccount Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_addonaccount/README.md b/[esx_addons]/esx_addonaccount/README.md index 6fea3a59..dff7e315 100644 --- a/[esx_addons]/esx_addonaccount/README.md +++ b/[esx_addons]/esx_addonaccount/README.md @@ -52,7 +52,7 @@ end) ### License esx_addonaccount - addon account for ESX -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_addoninventory/LICENSE b/[esx_addons]/esx_addoninventory/LICENSE index 22b7b313..107773f4 100644 --- a/[esx_addons]/esx_addoninventory/LICENSE +++ b/[esx_addons]/esx_addoninventory/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_addoninventory - Copyright (C) 2015 Jérémie N'gadi + esx_addoninventory + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_addoninventory Copyright (C) 2015 Jérémie N'gadi + esx_addoninventory Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_addoninventory/README.md b/[esx_addons]/esx_addoninventory/README.md index 015bf74b..8c7445e0 100644 --- a/[esx_addons]/esx_addoninventory/README.md +++ b/[esx_addons]/esx_addoninventory/README.md @@ -52,7 +52,7 @@ end) ### License esx_addoninventory - inventories! -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_ambulancejob/LICENSE b/[esx_addons]/esx_ambulancejob/LICENSE index dcfcef62..46c7df66 100644 --- a/[esx_addons]/esx_ambulancejob/LICENSE +++ b/[esx_addons]/esx_ambulancejob/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_ambulancejob - Copyright (C) 2015 Jérémie N'gadi + esx_ambulancejob + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_ambulancejob Copyright (C) 2015 Jérémie N'gadi + esx_ambulancejob Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_ambulancejob/README.md b/[esx_addons]/esx_ambulancejob/README.md index 5476caee..79a37642 100644 --- a/[esx_addons]/esx_ambulancejob/README.md +++ b/[esx_addons]/esx_ambulancejob/README.md @@ -44,7 +44,7 @@ start esx_ambulancejob ### License esx_ambulancejob - ambulance script for fivem -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_animations/LICENSE b/[esx_addons]/esx_animations/LICENSE index b2b5ee8a..b99379bf 100644 --- a/[esx_addons]/esx_animations/LICENSE +++ b/[esx_addons]/esx_animations/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_animations - Copyright (C) 2015 Jérémie N'gadi + esx_animations + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_animations Copyright (C) 2015 Jérémie N'gadi + esx_animations Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_animations/README.md b/[esx_addons]/esx_animations/README.md index a7b9a550..ca823890 100644 --- a/[esx_addons]/esx_animations/README.md +++ b/[esx_addons]/esx_animations/README.md @@ -28,7 +28,7 @@ start esx_animations ### License esx_animations - play anims! -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_atm/LICENSE b/[esx_addons]/esx_atm/LICENSE index 22607bc9..5944b889 100644 --- a/[esx_addons]/esx_atm/LICENSE +++ b/[esx_addons]/esx_atm/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_atm - Copyright (C) 2015 Jérémie N'gadi + esx_atm + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_atm Copyright (C) 2015 Jérémie N'gadi + esx_atm Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_atm/README.md b/[esx_addons]/esx_atm/README.md index 38441b41..0aa3ebf8 100644 --- a/[esx_addons]/esx_atm/README.md +++ b/[esx_addons]/esx_atm/README.md @@ -28,7 +28,7 @@ start esx_atm ### License esx_atm - atm script for ESX -Copyright (C) 2015-2018 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_bankerjob/LICENSE b/[esx_addons]/esx_bankerjob/LICENSE index ed4304db..b3c6b94d 100644 --- a/[esx_addons]/esx_bankerjob/LICENSE +++ b/[esx_addons]/esx_bankerjob/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_bankerjob - Copyright (C) 2015 Jérémie N'gadi + esx_bankerjob + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_bankerjob Copyright (C) 2015 Jérémie N'gadi + esx_bankerjob Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_bankerjob/README.md b/[esx_addons]/esx_bankerjob/README.md index 5ce9a720..18e8b6d5 100644 --- a/[esx_addons]/esx_bankerjob/README.md +++ b/[esx_addons]/esx_bankerjob/README.md @@ -35,7 +35,7 @@ start esx_bankerjob ### License esx_bankerjob - bank script -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_barbershop/LICENSE b/[esx_addons]/esx_barbershop/LICENSE index 35fcddf5..fceb47c8 100644 --- a/[esx_addons]/esx_barbershop/LICENSE +++ b/[esx_addons]/esx_barbershop/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_barbershop - Copyright (C) 2015 Jérémie N'gadi + esx_barbershop + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_barbershop Copyright (C) 2015 Jérémie N'gadi + esx_barbershop Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_barbershop/README.md b/[esx_addons]/esx_barbershop/README.md index a0018489..60ae5401 100644 --- a/[esx_addons]/esx_barbershop/README.md +++ b/[esx_addons]/esx_barbershop/README.md @@ -31,7 +31,7 @@ start esx_barbershop ### License esx_barbershop - barber shop! -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_basicneeds/LICENSE b/[esx_addons]/esx_basicneeds/LICENSE index 1d210279..7ac56c99 100644 --- a/[esx_addons]/esx_basicneeds/LICENSE +++ b/[esx_addons]/esx_basicneeds/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_basicneeds - Copyright (C) 2015 Jérémie N'gadi + esx_basicneeds + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_basicneeds Copyright (C) 2015 Jérémie N'gadi + esx_basicneeds Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_basicneeds/README.md b/[esx_addons]/esx_basicneeds/README.md index d1d13813..5f083302 100644 --- a/[esx_addons]/esx_basicneeds/README.md +++ b/[esx_addons]/esx_basicneeds/README.md @@ -34,7 +34,7 @@ start esx_basicneeds ### License esx_basicneeds - thirst and hunger system -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_billing/LICENSE b/[esx_addons]/esx_billing/LICENSE index 79725e27..84c1570d 100644 --- a/[esx_addons]/esx_billing/LICENSE +++ b/[esx_addons]/esx_billing/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_billing - Copyright (C) 2015 Jérémie N'gadi + esx_billing + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_billing Copyright (C) 2015 Jérémie N'gadi + esx_billing Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_billing/README.md b/[esx_addons]/esx_billing/README.md index 2fcfd7ae..5c04c698 100644 --- a/[esx_addons]/esx_billing/README.md +++ b/[esx_addons]/esx_billing/README.md @@ -48,7 +48,7 @@ end ### License esx_billing - billing for ESX -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_boat/LICENSE b/[esx_addons]/esx_boat/LICENSE index 94a9ed02..bb673aa4 100644 --- a/[esx_addons]/esx_boat/LICENSE +++ b/[esx_addons]/esx_boat/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - - Copyright (C) + esx_boat + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - Copyright (C) + esx_boat Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_boat/README.md b/[esx_addons]/esx_boat/README.md index 881816ed..3d657268 100644 --- a/[esx_addons]/esx_boat/README.md +++ b/[esx_addons]/esx_boat/README.md @@ -33,7 +33,7 @@ start esx_boat ### License esx_boat - Boat shop and garage for ESX -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_boat/client/main.lua b/[esx_addons]/esx_boat/client/main.lua index 9e9d3206..c2ede575 100644 --- a/[esx_addons]/esx_boat/client/main.lua +++ b/[esx_addons]/esx_boat/client/main.lua @@ -1,4 +1,4 @@ -local isInShopMenu = false +isInShopMenu = false local spawnedVehicles = {} function OpenBoatShop(shop) diff --git a/[esx_addons]/esx_boat/client/marker.lua b/[esx_addons]/esx_boat/client/marker.lua index 5a41c196..46e18481 100644 --- a/[esx_addons]/esx_boat/client/marker.lua +++ b/[esx_addons]/esx_boat/client/marker.lua @@ -1,9 +1,9 @@ local HasAlreadyEnteredMarker = false local LastZone = nil -local CurrentAction = nil -local CurrentActionMsg = '' -local CurrentActionData = {} +CurrentAction = nil +CurrentActionMsg = '' +CurrentActionData = {} -- Key controls Citizen.CreateThread(function() diff --git a/[esx_addons]/esx_clotheshop/LICENSE b/[esx_addons]/esx_clotheshop/LICENSE index 919ca443..c2a404cf 100644 --- a/[esx_addons]/esx_clotheshop/LICENSE +++ b/[esx_addons]/esx_clotheshop/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_clotheshop - Copyright (C) 2015 Jérémie N'gadi + esx_clotheshop + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_clotheshop Copyright (C) 2015 Jérémie N'gadi + esx_clotheshop Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_clotheshop/README.md b/[esx_addons]/esx_clotheshop/README.md index e441797f..d3ce745e 100644 --- a/[esx_addons]/esx_clotheshop/README.md +++ b/[esx_addons]/esx_clotheshop/README.md @@ -31,7 +31,7 @@ start esx_clotheshop ### License esx_clotheshop - clothing store -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_cruisecontrol/LICENSE b/[esx_addons]/esx_cruisecontrol/LICENSE index 0f4f5d61..3ca99747 100644 --- a/[esx_addons]/esx_cruisecontrol/LICENSE +++ b/[esx_addons]/esx_cruisecontrol/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-async - Copyright (C) 2015 Jérémie N'gadi + async + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-async Copyright (C) 2015 Jérémie N'gadi + async Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_datastore/LICENSE b/[esx_addons]/esx_datastore/LICENSE index dae281b8..9edb31d6 100644 --- a/[esx_addons]/esx_datastore/LICENSE +++ b/[esx_addons]/esx_datastore/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_datastore - Copyright (C) 2015 Jérémie N'gadi + esx_datastore + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_datastore Copyright (C) 2015 Jérémie N'gadi + esx_datastore Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_datastore/README.md b/[esx_addons]/esx_datastore/README.md index 97236dcb..1415a48f 100644 --- a/[esx_addons]/esx_datastore/README.md +++ b/[esx_addons]/esx_datastore/README.md @@ -55,7 +55,7 @@ end) ### License esx_datastore - datastore inventory for ESX -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_dmvschool/LICENSE b/[esx_addons]/esx_dmvschool/LICENSE index 0f4f5d61..73aca2a6 100644 --- a/[esx_addons]/esx_dmvschool/LICENSE +++ b/[esx_addons]/esx_dmvschool/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-async - Copyright (C) 2015 Jérémie N'gadi + esx_dmvschool + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-async Copyright (C) 2015 Jérémie N'gadi + esx_dmvschool Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_dmvschool/README.md b/[esx_addons]/esx_dmvschool/README.md index 164a46dc..30969bc6 100644 --- a/[esx_addons]/esx_dmvschool/README.md +++ b/[esx_addons]/esx_dmvschool/README.md @@ -33,7 +33,7 @@ start esx_dmvschool ### License esx_dmvschool - realistic DMV school for ESX -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_drugs/LICENSE b/[esx_addons]/esx_drugs/LICENSE index 9e419e04..207472b6 100644 --- a/[esx_addons]/esx_drugs/LICENSE +++ b/[esx_addons]/esx_drugs/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - - Copyright (C) + esx_drugs + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - Copyright (C) + esx_drugs Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_drugs/README.md b/[esx_addons]/esx_drugs/README.md index 99c4267a..37160e6d 100644 --- a/[esx_addons]/esx_drugs/README.md +++ b/[esx_addons]/esx_drugs/README.md @@ -35,7 +35,7 @@ start esx_drugs ### License esx_drugs - drugs job -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_garage/LICENSE b/[esx_addons]/esx_garage/LICENSE index c72a6b14..e2b48602 100644 --- a/[esx_addons]/esx_garage/LICENSE +++ b/[esx_addons]/esx_garage/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_garage - Copyright (C) 2015 Jérémie N'gadi + esx_garage + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_garage Copyright (C) 2015 Jérémie N'gadi + esx_garage Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_holdup/LICENSE b/[esx_addons]/esx_holdup/LICENSE index 71b4479e..a8965660 100644 --- a/[esx_addons]/esx_holdup/LICENSE +++ b/[esx_addons]/esx_holdup/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver_esx_holdup - Copyright (C) 2015 Jérémie N'gadi + esx_holdup + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver_esx_holdup Copyright (C) 2015 Jérémie N'gadi + esx_holdup Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_holdup/README.md b/[esx_addons]/esx_holdup/README.md index 6e908cb8..ec25ea35 100644 --- a/[esx_addons]/esx_holdup/README.md +++ b/[esx_addons]/esx_holdup/README.md @@ -32,7 +32,7 @@ start esx_holdup ### License esx_holdup - rob stores -Copyright (C) 2015-2018 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_joblisting/LICENSE b/[esx_addons]/esx_joblisting/LICENSE index d8ab8d4a..6fb0ee12 100644 --- a/[esx_addons]/esx_joblisting/LICENSE +++ b/[esx_addons]/esx_joblisting/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_joblisting - Copyright (C) 2015 Jérémie N'gadi + esx_joblisting + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_joblisting Copyright (C) 2015 Jérémie N'gadi + esx_joblisting Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_joblisting/README.md b/[esx_addons]/esx_joblisting/README.md index ae32faa2..5dc97b29 100644 --- a/[esx_addons]/esx_joblisting/README.md +++ b/[esx_addons]/esx_joblisting/README.md @@ -31,7 +31,7 @@ start esx_joblisting ### License esx_joblisting - job listing script -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_jobs/LICENSE b/[esx_addons]/esx_jobs/LICENSE index 553b1cd3..62ae7eb7 100644 --- a/[esx_addons]/esx_jobs/LICENSE +++ b/[esx_addons]/esx_jobs/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_jobs - Copyright (C) 2015 Jérémie N'gadi + esx_jobs + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_jobs Copyright (C) 2015 Jérémie N'gadi + esx_jobs Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_jobs/README.md b/[esx_addons]/esx_jobs/README.md index bf319363..145edf29 100644 --- a/[esx_addons]/esx_jobs/README.md +++ b/[esx_addons]/esx_jobs/README.md @@ -56,7 +56,7 @@ CloakRoom = { ### License esx_jobs - jobs -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_license/LICENSE b/[esx_addons]/esx_license/LICENSE index 0f4f5d61..1352746c 100644 --- a/[esx_addons]/esx_license/LICENSE +++ b/[esx_addons]/esx_license/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-async - Copyright (C) 2015 Jérémie N'gadi + esx_license + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-async Copyright (C) 2015 Jérémie N'gadi + esx_license Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_lscustom/LICENSE b/[esx_addons]/esx_lscustom/LICENSE index 9cecc1d4..a5e7adf7 100644 --- a/[esx_addons]/esx_lscustom/LICENSE +++ b/[esx_addons]/esx_lscustom/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} + esx_lscustom + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - {project} Copyright (C) {year} {fullname} + esx_lscustom Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_lscustom/README.md b/[esx_addons]/esx_lscustom/README.md index 199b94db..98a9a4ee 100644 --- a/[esx_addons]/esx_lscustom/README.md +++ b/[esx_addons]/esx_lscustom/README.md @@ -31,7 +31,7 @@ start esx_lscustom ### License esx_lscustoms - The best LS Custom out there for FX -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_mechanicjob/LICENSE b/[esx_addons]/esx_mechanicjob/LICENSE index ae135391..62bb246b 100644 --- a/[esx_addons]/esx_mechanicjob/LICENSE +++ b/[esx_addons]/esx_mechanicjob/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_mecanojob - Copyright (C) 2015 Jérémie N'gadi + esx_mechanicjob + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_mechanicjob Copyright (C) 2015-2020 Jérémie N'gadi + esx_mechanicjob Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_mechanicjob/README.md b/[esx_addons]/esx_mechanicjob/README.md index aedf558f..c1f39e35 100644 --- a/[esx_addons]/esx_mechanicjob/README.md +++ b/[esx_addons]/esx_mechanicjob/README.md @@ -39,7 +39,7 @@ start esx_mechanicjob ### License esx_mechanicjob - mechanic job for ESX -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_multicharacter/client/main.lua b/[esx_addons]/esx_multicharacter/client/main.lua index 3d7aab44..242d159d 100644 --- a/[esx_addons]/esx_multicharacter/client/main.lua +++ b/[esx_addons]/esx_multicharacter/client/main.lua @@ -25,12 +25,17 @@ if ESX.GetConfig().Multichar then ESX.PlayerLoaded = false ESX.PlayerData = {} Spawned = false - cam = CreateCamWithParams("DEFAULT_SCRIPTED_CAMERA", Config.Spawn.x, Config.Spawn.y+1.6, Config.Spawn.z+1.3, 0.0, 0.0, 180.0, 100.00, false, 0) - SetEntityCoords(PlayerPedId(), Config.Spawn.x, Config.Spawn.y, Config.Spawn.z, true, false, false, false) - SetEntityHeading(PlayerPedId(), Config.Spawn.w) + cam = CreateCam("DEFAULT_SCRIPTED_CAMERA", true) + local playerPed = PlayerPedId() + SetEntityCoords(playerPed, Config.Spawn.x, Config.Spawn.y, Config.Spawn.z, true, false, false, false) + SetEntityHeading(playerPed, Config.Spawn.w) + local offset = GetOffsetFromEntityInWorldCoords(playerPed, 0, 1.7, 0.4) DoScreenFadeOut(0) SetCamActive(cam, true) RenderScriptCams(true, false, 1, true, true) + SetCamCoord(cam, offset.x, offset.y, offset.z) + PointCamAtCoord(cam, Config.Spawn.x, Config.Spawn.y, Config.Spawn.z + 1.3) + ESX.UI.HUD.SetDisplay(0.0) StartLoop() ShutdownLoadingScreen() @@ -110,8 +115,8 @@ if ESX.GetConfig().Multichar then TriggerEvent('skinchanger:loadSkin', skin) end DoScreenFadeIn(400) - while IsScreenFadedOut() do Citizen.Wait(100) end end) + repeat Citizen.Wait(200) until not IsScreenFadedOut() elseif Characters[index] and Characters[index].skin then if Characters[Spawned] and Characters[Spawned].model then @@ -254,20 +259,9 @@ if ESX.GetConfig().Multichar then RegisterNetEvent('esx:playerLoaded') AddEventHandler('esx:playerLoaded', function(playerData, isNew, skin) - DoScreenFadeOut(100) local spawn = playerData.coords - local playerPed = PlayerPedId() - FreezeEntityPosition(playerPed, true) - SetEntityCoords(playerPed, spawn.x, spawn.y, spawn.z-1.3, true, false, false, false) - SetEntityHeading(playerPed, spawn.heading) - Citizen.Wait(300) - SetCamActive(cam, false) - RenderScriptCams(0, 0) - DestroyAllCams(true) - DoScreenFadeIn(400) - Citizen.Wait(400) - if isNew or not skin or #skin == 1 then + local finished = false local sex = skin.sex or 0 if sex == 0 then model = `mp_m_freemode_01` else model = `mp_f_freemode_01` end RequestModel(model) @@ -286,16 +280,22 @@ if ESX.GetConfig().Multichar then TriggerEvent('esx_skin:openSaveableMenu', function() finished = true end, function() finished = true end) - SetEntityHeading(playerPed, spawn.heading) end) - while not finished do Citizen.Wait(200) end - else - local playerPed = PlayerPedId() - SetEntityHeading(playerPed, spawn.heading) - TriggerEvent('skinchanger:loadSkin', skin or Characters[Spawned].skin) - playerPed = PlayerPedId() - SetEntityVisible(playerPed, true, 0) + repeat Citizen.Wait(200) until finished end + DoScreenFadeOut(100) + repeat Citizen.Wait(200) until IsScreenFadedOut() + SetCamActive(cam, false) + RenderScriptCams(false, false, 0, true, true) + cam = nil + local playerPed = PlayerPedId() + FreezeEntityPosition(playerPed, true) + SetEntityCoords(playerPed, spawn.x, spawn.y, spawn.z-1.3, true, false, false, false) + SetEntityHeading(playerPed, spawn.heading) + if not isNew then TriggerEvent('skinchanger:loadSkin', skin or Characters[Spawned].skin) end + Citizen.Wait(400) + DoScreenFadeIn(400) + repeat Citizen.Wait(200) until not IsScreenFadedOut() TriggerServerEvent('esx:onPlayerSpawn') TriggerEvent('esx:onPlayerSpawn') TriggerEvent('playerSpawned') diff --git a/[esx_addons]/esx_multicharacter/config.lua b/[esx_addons]/esx_multicharacter/config.lua index a444f660..0dff5211 100644 --- a/[esx_addons]/esx_multicharacter/config.lua +++ b/[esx_addons]/esx_multicharacter/config.lua @@ -2,7 +2,8 @@ Config = {} Config.Locale = 'en' Config.Slots = 4 -Config.Spawn = vector4(-113.7, 565.3, 195.2, 0) +Config.Spawn = vector4(-113.7, 565.3, 195.2, 0) -- Sets the location for character selection +-- To set the spawn location for new characters, modify the default value in the `users` SQL table -------------------- -- Do not use unless you are prepared to adjust your resources to correctly reset data diff --git a/[esx_addons]/esx_multicharacter/fxmanifest.lua b/[esx_addons]/esx_multicharacter/fxmanifest.lua index 57787aaa..617f933c 100644 --- a/[esx_addons]/esx_multicharacter/fxmanifest.lua +++ b/[esx_addons]/esx_multicharacter/fxmanifest.lua @@ -1,7 +1,7 @@ fx_version 'adamant' game 'gta5' description 'https://github.com/thelindat/esx_multicharacter' -version '1.2.1' +version '1.2.2' dependencies { 'es_extended', diff --git a/[esx_addons]/esx_multicharacter/readme.md b/[esx_addons]/esx_multicharacter/readme.md index c4d591d3..7fb62877 100644 --- a/[esx_addons]/esx_multicharacter/readme.md +++ b/[esx_addons]/esx_multicharacter/readme.md @@ -1,8 +1,5 @@ -

Although this resource is included, a more updated version may be available.

- - ### Requirements (ensure you are using the latest) -- [ESX Legacy](https://github.com/esx-framework/es_extended/tree/legacy) +- [ESX Legacy](https://github.com/esx-framework/esx-legacy) - [MySQL Async 3.3.2](https://github.com/brouznouf/fivem-mysql-async/releases/tag/3.3.2) - [ESX Identity](https://github.com/esx-framework/esx_identity) - [ESX Skin](https://github.com/esx-framework/esx_skin) @@ -12,27 +9,26 @@ - Modify your ESX config with `Config.Multichar = true` - Set your database name for `Config.Database` in server/main.lua - All owner and identifier columns should be set to `VARCHAR(60)` to ensure correct data entry -- Use the `varchar` command from the console to update your SQL tables -- Once you have used the command you should just remove it for sanity's sake + - The resource will attempt to set columns automatically ### Conflicts * The following resources should not be used with ESX Legacy and can result in errors - - **essentialsmode** + - essentialmode - basic-gamemode - fivem-map-skater - fivem-map-hipster - default_spawnpoint - - cui_character (or other resources that modify spawn behaviour) ### Common issues #### Black screen / loading scripts - Download and run all requirements + - Use a fresh spawnmanager as many people alter the code - Ensure none of the conflicting resources are enabled #### mysql-async duplicate entry - You have not increased the VARCHAR size of the table holding identifiers - usually `owner` or `identifier` #### The menu interface is esx_menu_default - you can use any version if you want a different appearance -![image](https://user-images.githubusercontent.com/65407488/119010385-592a8c80-b9d7-11eb-9aa1-eb7051004843.png) +![image](https://user-images.githubusercontent.com/65407488/126976325-17cc3241-bb9e-451f-a6ed-610a8ef52fa5.png) ### Relogging - Do not enable this setting if you do not intend to properly set up relog support diff --git a/[esx_addons]/esx_multicharacter/server/main.lua b/[esx_addons]/esx_multicharacter/server/main.lua index 4a52cac9..ea74dafa 100644 --- a/[esx_addons]/esx_multicharacter/server/main.lua +++ b/[esx_addons]/esx_multicharacter/server/main.lua @@ -1,5 +1,5 @@ if not ESX then - SetTimeout(3000, print('[^3WARNING^7] Unable to start Multicharacter - your version of ESX is not compatible ')) + SetTimeout(3000, function() print('[^3WARNING^7] Unable to start Multicharacter - your version of ESX is not compatible ') end) elseif ESX.GetConfig().Multichar == true then local IdentifierTables, Fetch = {}, -1 @@ -44,12 +44,20 @@ elseif ESX.GetConfig().Multichar == true then local DeleteCharacter = function(playerId, charid) local identifier = Config.Prefix..charid..':'..ESX.GetIdentifier(playerId) + local counter = 0 for k, v in pairs(IdentifierTables) do MySQL.Async.execute("DELETE FROM "..v.table.." WHERE "..v.column.." = ?", { identifier - }) + }, function() + counter = counter + 1 + if counter == #IdentifierTables then + print(('[^2INFO^7] Player [%s] %s has deleted a character (%s)'):format(GetPlayerName(playerId), playerId, identifier)) + Citizen.Wait(100) + SetupCharacters(playerId) + end + end) + Citizen.Wait(5) end - print(('[^2INFO^7] Player [%s] %s has deleted a character (%s)'):format(GetPlayerName(playerId), playerId, identifier)) end MySQL.ready(function() @@ -106,7 +114,6 @@ elseif ESX.GetConfig().Multichar == true then local src = source if type(charid) == "number" and string.len(charid) <= 2 then DeleteCharacter(src, charid) - SetupCharacters(src) end end) @@ -121,5 +128,5 @@ elseif ESX.GetConfig().Multichar == true then end, true) else - SetTimeout(3000, print('[^3WARNING^7] Multicharacter is disabled - please check your ESX configuration')) + SetTimeout(3000, function() print('[^3WARNING^7] Multicharacter is disabled - please check your ESX configuration') end) end diff --git a/[esx_addons]/esx_optionalneeds/LICENSE b/[esx_addons]/esx_optionalneeds/LICENSE index 1dcee90d..b5302b23 100644 --- a/[esx_addons]/esx_optionalneeds/LICENSE +++ b/[esx_addons]/esx_optionalneeds/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_optionalneeds - Copyright (C) 2015 Jérémie N'gadi + esx_optionalneeds + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_optionalneeds Copyright (C) 2015 Jérémie N'gadi + esx_optionalneeds Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_phone/LICENSE b/[esx_addons]/esx_phone/LICENSE index 9f1d07ea..871e8772 100644 --- a/[esx_addons]/esx_phone/LICENSE +++ b/[esx_addons]/esx_phone/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_phone - Copyright (C) 2015 Jérémie N'gadi + esx_phone + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_phone Copyright (C) 2015 Jérémie N'gadi + esx_phone Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_phone/README.md b/[esx_addons]/esx_phone/README.md index 0016229b..7e459133 100644 --- a/[esx_addons]/esx_phone/README.md +++ b/[esx_addons]/esx_phone/README.md @@ -60,7 +60,7 @@ last two booleans are optional ### License esx_phone - phone script for fivem -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_policejob/LICENSE b/[esx_addons]/esx_policejob/LICENSE index 49c66f5e..66c341ef 100644 --- a/[esx_addons]/esx_policejob/LICENSE +++ b/[esx_addons]/esx_policejob/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_policejob - Copyright (C) 2015 Jérémie N'gadi + esx_policejob + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_policejob Copyright (C) 2015 Jérémie N'gadi + esx_policejob Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_policejob/README.md b/[esx_addons]/esx_policejob/README.md index 16504542..5aa70593 100644 --- a/[esx_addons]/esx_policejob/README.md +++ b/[esx_addons]/esx_policejob/README.md @@ -59,7 +59,7 @@ start esx_policejob ### License esx_policejob - police script for ESX -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_policejob/client/main.lua b/[esx_addons]/esx_policejob/client/main.lua index 26ffe26c..6266689c 100644 --- a/[esx_addons]/esx_policejob/client/main.lua +++ b/[esx_addons]/esx_policejob/client/main.lua @@ -3,10 +3,17 @@ local HasAlreadyEnteredMarker, isDead, isHandcuffed, hasAlreadyJoined, playerInS local LastStation, LastPart, LastPartNum, LastEntity, CurrentAction, CurrentActionMsg dragStatus.isDragged, isInShopMenu = false, false -if ESX.PlayerLoaded and ESX.PlayerData.job == 'police' then - Citizen.Wait(1000) - TriggerServerEvent('esx_policejob:forceBlip') -end +RegisterNetEvent('esx:playerLoaded') +AddEventHandler('esx:playerLoaded', function(xPlayer) + ESX.PlayerData = xPlayer + ESX.PlayerLoaded = true +end) + +RegisterNetEvent('esx:onPlayerLogout') +AddEventHandler('esx:onPlayerLogout', function() + ESX.PlayerLoaded = false + ESX.PlayerData = {} +end) function cleanPlayer(playerPed) SetPedArmour(playerPed, 0) @@ -1562,3 +1569,9 @@ function ImpoundVehicle(vehicle) ESX.ShowNotification(_U('impound_successful')) currentTask.busy = false end + +if ESX.PlayerLoaded and ESX.PlayerData.job == 'police' then + SetTimeout(1000, function() + TriggerServerEvent('esx_policejob:forceBlip') + end) +end \ No newline at end of file diff --git a/[esx_addons]/esx_property/LICENSE b/[esx_addons]/esx_property/LICENSE index 0bcccde6..50d54b0c 100644 --- a/[esx_addons]/esx_property/LICENSE +++ b/[esx_addons]/esx_property/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_property - Copyright (C) 2015 Jérémie N'gadi + esx_property + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_property Copyright (C) 2015 Jérémie N'gadi + esx_property Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_property/README.md b/[esx_addons]/esx_property/README.md index 8c230af9..51e1fa85 100644 --- a/[esx_addons]/esx_property/README.md +++ b/[esx_addons]/esx_property/README.md @@ -39,7 +39,7 @@ start esx_property ### License esx_property - own a property! -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_realestateagentjob/LICENSE b/[esx_addons]/esx_realestateagentjob/LICENSE index aa780afb..d329e234 100644 --- a/[esx_addons]/esx_realestateagentjob/LICENSE +++ b/[esx_addons]/esx_realestateagentjob/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_realestateagentjob - Copyright (C) 2015 Jérémie N'gadi + esx_realestateagentjob + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_realestateagentjob Copyright (C) 2015 Jérémie N'gadi + esx_realestateagentjob Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_realestateagentjob/README.md b/[esx_addons]/esx_realestateagentjob/README.md index 21d5fdb5..78eb2550 100644 --- a/[esx_addons]/esx_realestateagentjob/README.md +++ b/[esx_addons]/esx_realestateagentjob/README.md @@ -31,7 +31,7 @@ git clone https://github.com/ESX-Org/esx_realestateagentjob [esx]/esx_realestate ### License esx_realestateagentjob - real estate job -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_rpchat/LICENSE b/[esx_addons]/esx_rpchat/LICENSE index 9cecc1d4..61fd1535 100644 --- a/[esx_addons]/esx_rpchat/LICENSE +++ b/[esx_addons]/esx_rpchat/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} + esx_rpchat + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - {project} Copyright (C) {year} {fullname} + esx_rpchat Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_rpchat/README.md b/[esx_addons]/esx_rpchat/README.md index bf364c90..7ae168fc 100644 --- a/[esx_addons]/esx_rpchat/README.md +++ b/[esx_addons]/esx_rpchat/README.md @@ -27,7 +27,7 @@ git clone https://github.com/ESX-Org/esx_rpchat [esx]/esx_rpchat ### License esx_rpchat - RP chat for ESX -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_service/LICENSE b/[esx_addons]/esx_service/LICENSE index 3728435e..790e8b3d 100644 --- a/[esx_addons]/esx_service/LICENSE +++ b/[esx_addons]/esx_service/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_service - Copyright (C) 2015 Jérémie N'gadi + esx_service + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_service Copyright (C) 2015 Jérémie N'gadi + esx_service Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_service/README.md b/[esx_addons]/esx_service/README.md index 8e314b88..b1125d98 100644 --- a/[esx_addons]/esx_service/README.md +++ b/[esx_addons]/esx_service/README.md @@ -45,7 +45,7 @@ TriggerServerEvent('esx_service:disableService', 'taxi') ### License esx_service - be in service -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_shops/LICENSE b/[esx_addons]/esx_shops/LICENSE index 36cb0ed1..186fd7f0 100644 --- a/[esx_addons]/esx_shops/LICENSE +++ b/[esx_addons]/esx_shops/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_shops - Copyright (C) 2015 Jérémie N'gadi + esx_shops + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_shops Copyright (C) 2015 Jérémie N'gadi + esx_shops Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_shops/README.md b/[esx_addons]/esx_shops/README.md index 40271425..50412571 100644 --- a/[esx_addons]/esx_shops/README.md +++ b/[esx_addons]/esx_shops/README.md @@ -29,7 +29,7 @@ start esx_shops ### License esx_shops - shoppin' -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_sit/LICENSE b/[esx_addons]/esx_sit/LICENSE index 88c253ec..d99d13ca 100644 --- a/[esx_addons]/esx_sit/LICENSE +++ b/[esx_addons]/esx_sit/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_sit - Copyright (C) 2015 Jérémie N'gadi + esx_sit + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_sit Copyright (C) 2015 Jérémie N'gadi + esx_sit Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_sit/README.md b/[esx_addons]/esx_sit/README.md index 74c5d7a7..807fe0d8 100644 --- a/[esx_addons]/esx_sit/README.md +++ b/[esx_addons]/esx_sit/README.md @@ -40,7 +40,7 @@ start esx_sit esx_sit -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_society/LICENSE b/[esx_addons]/esx_society/LICENSE index d215c267..8fb23c52 100644 --- a/[esx_addons]/esx_society/LICENSE +++ b/[esx_addons]/esx_society/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_society - Copyright (C) 2015 Jérémie N'gadi + esx_society + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_society Copyright (C) 2015 Jérémie N'gadi + esx_society Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_society/README.md b/[esx_addons]/esx_society/README.md index 983abdd2..2083fdb7 100644 --- a/[esx_addons]/esx_society/README.md +++ b/[esx_addons]/esx_society/README.md @@ -53,7 +53,7 @@ end, {wash = false}) -- set custom options, e.g disable washing ### License esx_society - societies for ESX -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_status/LICENSE b/[esx_addons]/esx_status/LICENSE index f1e87985..8645bfed 100644 --- a/[esx_addons]/esx_status/LICENSE +++ b/[esx_addons]/esx_status/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_status - Copyright (C) 2015 Jérémie N'gadi + esx_status + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_status Copyright (C) 2015 Jérémie N'gadi + esx_status Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_taxijob/LICENSE b/[esx_addons]/esx_taxijob/LICENSE index 4d837ce0..602dc5d8 100644 --- a/[esx_addons]/esx_taxijob/LICENSE +++ b/[esx_addons]/esx_taxijob/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_taxijob - Copyright (C) 2015 Jérémie N'gadi + esx_taxijob + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_taxijob Copyright (C) 2015 Jérémie N'gadi + esx_taxijob Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_taxijob/README.md b/[esx_addons]/esx_taxijob/README.md index cc46a37a..d5da6e4a 100644 --- a/[esx_addons]/esx_taxijob/README.md +++ b/[esx_addons]/esx_taxijob/README.md @@ -40,7 +40,7 @@ start esx_taxijob ### License esx_taxijob -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_vehicleshop/LICENSE b/[esx_addons]/esx_vehicleshop/LICENSE index 12a695e0..bfcc2c72 100644 --- a/[esx_addons]/esx_vehicleshop/LICENSE +++ b/[esx_addons]/esx_vehicleshop/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_vehicleshop - Copyright (C) 2015 Jérémie N'gadi + esx_vehicleshop + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_vehicleshop Copyright (C) 2015 Jérémie N'gadi + esx_vehicleshop Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_vehicleshop/README.md b/[esx_addons]/esx_vehicleshop/README.md index 77e40f64..db9a58fa 100644 --- a/[esx_addons]/esx_vehicleshop/README.md +++ b/[esx_addons]/esx_vehicleshop/README.md @@ -50,7 +50,7 @@ start esx_vehicleshop esx_vehicleshop - vehicle shop for ESX -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_voice/LICENSE b/[esx_addons]/esx_voice/LICENSE index 9cecc1d4..d399702d 100644 --- a/[esx_addons]/esx_voice/LICENSE +++ b/[esx_addons]/esx_voice/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} + esx_voice + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - {project} Copyright (C) {year} {fullname} + esx_voice Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_voice/README.md b/[esx_addons]/esx_voice/README.md index 929a4a3c..29a3cfc8 100644 --- a/[esx_addons]/esx_voice/README.md +++ b/[esx_addons]/esx_voice/README.md @@ -32,7 +32,7 @@ start esx_voice ### License esx_voice -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_weaponshop/LICENSE b/[esx_addons]/esx_weaponshop/LICENSE index fa1c8a5f..ff707c84 100644 --- a/[esx_addons]/esx_weaponshop/LICENSE +++ b/[esx_addons]/esx_weaponshop/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_weashops - Copyright (C) 2015 Jérémie N'gadi + esx_weaponshop + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_weashops Copyright (C) 2015 Jérémie N'gadi + esx_weaponshop Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_weaponshop/README.md b/[esx_addons]/esx_weaponshop/README.md index 04c5b0d3..d67f09e0 100644 --- a/[esx_addons]/esx_weaponshop/README.md +++ b/[esx_addons]/esx_weaponshop/README.md @@ -31,7 +31,7 @@ start esx_weaponshop ### License esx_weaponshop - Legal and illegal weapon shops -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/esx_whitelist/LICENSE b/[esx_addons]/esx_whitelist/LICENSE index 9cecc1d4..53deb87f 100644 --- a/[esx_addons]/esx_whitelist/LICENSE +++ b/[esx_addons]/esx_whitelist/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} + esx_whitelist + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - {project} Copyright (C) {year} {fullname} + esx_whitelist Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_whitelist/README.md b/[esx_addons]/esx_whitelist/README.md index c4acb4fb..8e9b3143 100644 --- a/[esx_addons]/esx_whitelist/README.md +++ b/[esx_addons]/esx_whitelist/README.md @@ -29,7 +29,7 @@ start esx_whitelist ### License esx_whitelist - Whitelist script -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/[esx_addons]/instance/LICENSE b/[esx_addons]/instance/LICENSE index 3790339c..99b58a12 100644 --- a/[esx_addons]/instance/LICENSE +++ b/[esx_addons]/instance/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-instance - Copyright (C) 2015 Jérémie N'gadi + instance + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-instance Copyright (C) 2015 Jérémie N'gadi + instance Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/instance/README.md b/[esx_addons]/instance/README.md index 8df3fb52..c6e3daff 100644 --- a/[esx_addons]/instance/README.md +++ b/[esx_addons]/instance/README.md @@ -28,7 +28,7 @@ start instance ### License instance - enter buildings! -Copyright (C) 2015-2020 Jérémie N'gadi +Copyright (C) 2015-2021 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. diff --git a/esx_example/LICENSE b/esx_example/LICENSE index 642d021c..2054c731 100644 --- a/esx_example/LICENSE +++ b/esx_example/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - fxserver-esx_boilerplate - Copyright (C) 2015 Jérémie N'gadi + esx_example + Copyright (C) 2015-2021 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 @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - fxserver-esx_boilerplate Copyright (C) 2015 Jérémie N'gadi + esx_example Copyright (C) 2015-2021 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.