Merge pull request #11 from thelindat/main

Bug fixes for policejob, boat, accessories; version bump for multicharacter; update all license notices
This commit is contained in:
FuraXx
2021-07-28 13:49:18 +02:00
committed by GitHub
104 changed files with 272 additions and 252 deletions
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+5 -8
View File
@@ -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)
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
@@ -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'),
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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_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:
<program> Copyright (C) <year> <name of author>
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.
+1 -1
View File
@@ -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.
+1 -1
View File
@@ -1,4 +1,4 @@
local isInShopMenu = false
isInShopMenu = false
local spawnedVehicles = {}
function OpenBoatShop(shop)
+3 -3
View File
@@ -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()
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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_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:
<program> Copyright (C) <year> <name of author>
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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+24 -24
View File
@@ -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')
+2 -1
View File
@@ -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
@@ -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',
+5 -9
View File
@@ -1,8 +1,5 @@
<h3 align='center'>Although this resource is included, a more updated version <a href='https://github.com/thelindat/esx_multicharacter'>may be available</a>.</h3>
### 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
@@ -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
+3 -3
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+17 -4
View File
@@ -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
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.
+1 -1
View File
@@ -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.
+3 -3
View File
@@ -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.

Some files were not shown because too many files have changed in this diff Show More