From b9232a253303d595e551d769ce558fe570a4fca1 Mon Sep 17 00:00:00 2001 From: Mycroft Date: Wed, 23 Mar 2022 16:04:38 +0000 Subject: [PATCH] Revert "Feat: Add Official Multicharacter" This reverts commit e6dd5a5f2c11765609582a197c20b3035fc3c264. --- [SQL]/legacy.sql | 14 - [esx]/es_extended/config.lua | 2 +- [esx]/es_extended/fxmanifest.lua | 2 +- [esx]/es_extended/version.json | 4 +- [esx]/esx_identity/fxmanifest.lua | 2 +- [esx]/esx_menu_default/fxmanifest.lua | 2 +- [esx]/esx_menu_dialog/fxmanifest.lua | 2 +- [esx]/esx_menu_list/fxmanifest.lua | 2 +- [esx]/esx_multicharacter/LICENSE.md | 674 ------------------ [esx]/esx_multicharacter/client/main.lua | 335 --------- [esx]/esx_multicharacter/config.lua | 129 ---- .../esx_multicharacter/esx_multicharacter.sql | 9 - [esx]/esx_multicharacter/fxmanifest.lua | 39 - [esx]/esx_multicharacter/html/css/main.css | 70 -- [esx]/esx_multicharacter/html/js/app.js | 35 - [esx]/esx_multicharacter/html/locales/cs.js | 8 - [esx]/esx_multicharacter/html/locales/de.js | 8 - [esx]/esx_multicharacter/html/locales/en.js | 8 - [esx]/esx_multicharacter/html/locales/fr.js | 8 - [esx]/esx_multicharacter/html/locales/pl.js | 8 - [esx]/esx_multicharacter/html/locales/pt.js | 8 - [esx]/esx_multicharacter/html/locales/tr.js | 8 - [esx]/esx_multicharacter/html/ui.html | 24 - [esx]/esx_multicharacter/locales/cs.lua | 25 - [esx]/esx_multicharacter/locales/de.lua | 11 - [esx]/esx_multicharacter/locales/en.lua | 25 - [esx]/esx_multicharacter/locales/it.lua | 25 - [esx]/esx_multicharacter/locales/pt.lua | 11 - [esx]/esx_multicharacter/locales/tr.lua | 11 - [esx]/esx_multicharacter/readme.md | 59 -- [esx]/esx_multicharacter/server/commands.lua | 79 -- [esx]/esx_multicharacter/server/main.lua | 221 ------ [esx]/esx_skin/fxmanifest.lua | 2 +- [esx_addons]/esx_accessories/fxmanifest.lua | 2 +- [esx_addons]/esx_addonaccount/fxmanifest.lua | 2 +- .../esx_addoninventory/fxmanifest.lua | 2 +- [esx_addons]/esx_ambulancejob/fxmanifest.lua | 4 +- [esx_addons]/esx_animations/fxmanifest.lua | 2 +- [esx_addons]/esx_atm/fxmanifest.lua | 2 +- [esx_addons]/esx_bankerjob/fxmanifest.lua | 2 +- [esx_addons]/esx_barbershop/fxmanifest.lua | 2 +- [esx_addons]/esx_basicneeds/fxmanifest.lua | 2 +- [esx_addons]/esx_billing/fxmanifest.lua | 2 +- [esx_addons]/esx_boat/fxmanifest.lua | 2 +- [esx_addons]/esx_clotheshop/fxmanifest.lua | 2 +- [esx_addons]/esx_cruisecontrol/fxmanifest.lua | 2 +- [esx_addons]/esx_datastore/fxmanifest.lua | 2 +- [esx_addons]/esx_dmvschool/fxmanifest.lua | 2 +- [esx_addons]/esx_drugs/fxmanifest.lua | 2 +- [esx_addons]/esx_garage/fxmanifest.lua | 2 +- [esx_addons]/esx_holdup/fxmanifest.lua | 2 +- [esx_addons]/esx_joblisting/fxmanifest.lua | 2 +- [esx_addons]/esx_jobs/fxmanifest.lua | 2 +- [esx_addons]/esx_license/fxmanifest.lua | 2 +- [esx_addons]/esx_lscustom/fxmanifest.lua | 2 +- [esx_addons]/esx_mechanicjob/fxmanifest.lua | 2 +- [esx_addons]/esx_optionalneeds/fxmanifest.lua | 2 +- [esx_addons]/esx_phone/fxmanifest.lua | 2 +- [esx_addons]/esx_policejob/fxmanifest.lua | 2 +- [esx_addons]/esx_property/fxmanifest.lua | 2 +- .../esx_realestateagentjob/fxmanifest.lua | 2 +- [esx_addons]/esx_rpchat/fxmanifest.lua | 2 +- [esx_addons]/esx_service/fxmanifest.lua | 2 +- [esx_addons]/esx_shops/fxmanifest.lua | 2 +- [esx_addons]/esx_sit/fxmanifest.lua | 2 +- [esx_addons]/esx_society/fxmanifest.lua | 2 +- [esx_addons]/esx_status/fxmanifest.lua | 2 +- [esx_addons]/esx_taxijob/fxmanifest.lua | 2 +- [esx_addons]/esx_vehicleshop/fxmanifest.lua | 2 +- [esx_addons]/esx_voice/fxmanifest.lua | 2 +- [esx_addons]/esx_weaponshop/fxmanifest.lua | 2 +- [esx_addons]/esx_whitelist/fxmanifest.lua | 2 +- [esx_addons]/instance/fxmanifest.lua | 2 +- 73 files changed, 50 insertions(+), 1902 deletions(-) delete mode 100644 [esx]/esx_multicharacter/LICENSE.md delete mode 100644 [esx]/esx_multicharacter/client/main.lua delete mode 100644 [esx]/esx_multicharacter/config.lua delete mode 100644 [esx]/esx_multicharacter/esx_multicharacter.sql delete mode 100644 [esx]/esx_multicharacter/fxmanifest.lua delete mode 100644 [esx]/esx_multicharacter/html/css/main.css delete mode 100644 [esx]/esx_multicharacter/html/js/app.js delete mode 100644 [esx]/esx_multicharacter/html/locales/cs.js delete mode 100644 [esx]/esx_multicharacter/html/locales/de.js delete mode 100644 [esx]/esx_multicharacter/html/locales/en.js delete mode 100644 [esx]/esx_multicharacter/html/locales/fr.js delete mode 100644 [esx]/esx_multicharacter/html/locales/pl.js delete mode 100644 [esx]/esx_multicharacter/html/locales/pt.js delete mode 100644 [esx]/esx_multicharacter/html/locales/tr.js delete mode 100644 [esx]/esx_multicharacter/html/ui.html delete mode 100644 [esx]/esx_multicharacter/locales/cs.lua delete mode 100644 [esx]/esx_multicharacter/locales/de.lua delete mode 100644 [esx]/esx_multicharacter/locales/en.lua delete mode 100644 [esx]/esx_multicharacter/locales/it.lua delete mode 100644 [esx]/esx_multicharacter/locales/pt.lua delete mode 100644 [esx]/esx_multicharacter/locales/tr.lua delete mode 100644 [esx]/esx_multicharacter/readme.md delete mode 100644 [esx]/esx_multicharacter/server/commands.lua delete mode 100644 [esx]/esx_multicharacter/server/main.lua diff --git a/[SQL]/legacy.sql b/[SQL]/legacy.sql index f59c0ee1..ae6c1840 100644 --- a/[SQL]/legacy.sql +++ b/[SQL]/legacy.sql @@ -112,19 +112,6 @@ CREATE TABLE `cardealer_vehicles` ( -- -------------------------------------------------------- --- --- Table structure for table `multicharacter_slots` --- - -CREATE TABLE `multicharacter_slots` ( - `identifier` VARCHAR(60) NOT NULL, - `slots` INT(11) NOT NULL, - PRIMARY KEY (`identifier`) USING BTREE, - INDEX `slots` (`slots`) USING BTREE -) ENGINE=InnoDB; - --- -------------------------------------------------------- - -- -- Table structure for table `datastore` -- @@ -514,7 +501,6 @@ CREATE TABLE `users` ( `status` longtext DEFAULT NULL, `is_dead` tinyint(1) DEFAULT 0, `id` int(11) NOT NULL, - `disabled` TINYINT(1) NULL DEFAULT '0', `last_property` varchar(255) DEFAULT NULL ) ENGINE=InnoDB; diff --git a/[esx]/es_extended/config.lua b/[esx]/es_extended/config.lua index d18705bd..6d9f4203 100644 --- a/[esx]/es_extended/config.lua +++ b/[esx]/es_extended/config.lua @@ -18,5 +18,5 @@ Config.EnableDefaultInventory = true -- Display the default Inventory ( F2 ) Config.EnableWantedLevel = false -- Use Normal GTA wanted Level? Config.EnablePVP = true -- Allow Player to player combat -Config.Multichar = true -- Enable support for esx_multicharacter +Config.Multichar = false -- Enable support for esx_multicharacter Config.Identity = true -- Select a characters identity data before they have loaded in (this happens by default with multichar) diff --git a/[esx]/es_extended/fxmanifest.lua b/[esx]/es_extended/fxmanifest.lua index 5fdb4c7b..d25a3e5e 100644 --- a/[esx]/es_extended/fxmanifest.lua +++ b/[esx]/es_extended/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ES Extended' -version '1.6.5' +version '1.6.0' shared_scripts { 'locale.lua', diff --git a/[esx]/es_extended/version.json b/[esx]/es_extended/version.json index 147774cd..9f3db69d 100644 --- a/[esx]/es_extended/version.json +++ b/[esx]/es_extended/version.json @@ -1,5 +1,5 @@ { "version": "legacy", - "commit" : "1.6.5", - "changelog": "\n- Added Official Multicharacter" + "commit" : "1.4.2", + "changelog": "\n- Updated `Car` Command. Fixed some vulnerabilities. Fix SQL. Updated Commands." } diff --git a/[esx]/esx_identity/fxmanifest.lua b/[esx]/esx_identity/fxmanifest.lua index 79254f5e..1c4e4baf 100644 --- a/[esx]/esx_identity/fxmanifest.lua +++ b/[esx]/esx_identity/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Identity' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx]/esx_menu_default/fxmanifest.lua b/[esx]/esx_menu_default/fxmanifest.lua index 7139cca2..64a36d7f 100644 --- a/[esx]/esx_menu_default/fxmanifest.lua +++ b/[esx]/esx_menu_default/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Menu Default' -version '1.6.5' +version '1.6.0' client_scripts { '@es_extended/imports.lua', diff --git a/[esx]/esx_menu_dialog/fxmanifest.lua b/[esx]/esx_menu_dialog/fxmanifest.lua index 3a84362b..1959b086 100644 --- a/[esx]/esx_menu_dialog/fxmanifest.lua +++ b/[esx]/esx_menu_dialog/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Menu Dialog' -version '1.6.5' +version '1.6.0' client_scripts { '@es_extended/imports.lua', diff --git a/[esx]/esx_menu_list/fxmanifest.lua b/[esx]/esx_menu_list/fxmanifest.lua index f267511a..b980e57e 100644 --- a/[esx]/esx_menu_list/fxmanifest.lua +++ b/[esx]/esx_menu_list/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Menu List' -version '1.6.5' +version '1.6.0' client_scripts { '@es_extended/imports.lua', diff --git a/[esx]/esx_multicharacter/LICENSE.md b/[esx]/esx_multicharacter/LICENSE.md deleted file mode 100644 index f288702d..00000000 --- a/[esx]/esx_multicharacter/LICENSE.md +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -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) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -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) - 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. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/[esx]/esx_multicharacter/client/main.lua b/[esx]/esx_multicharacter/client/main.lua deleted file mode 100644 index cb10ca8f..00000000 --- a/[esx]/esx_multicharacter/client/main.lua +++ /dev/null @@ -1,335 +0,0 @@ -ESX = exports['es_extended']:getSharedObject() -if ESX.GetConfig().Multichar then - - Citizen.CreateThread(function() - while not ESX.PlayerLoaded do - Citizen.Wait(0) - if NetworkIsPlayerActive(PlayerId()) then - exports.spawnmanager:setAutoSpawn(false) - DoScreenFadeOut(0) - while not GetResourceState('esx_menu_default') == 'started' do - Citizen.Wait(0) - end - TriggerEvent("esx_multicharacter:SetupCharacters") - break - end - end - end) - - local canRelog, cam, spawned = true, nil, nil - local Characters = {} - - RegisterNetEvent('esx_multicharacter:SetupCharacters') - AddEventHandler('esx_multicharacter:SetupCharacters', function() - ESX.PlayerLoaded = false - ESX.PlayerData = {} - spawned = false - 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.Menu.CloseAll() - ESX.UI.HUD.SetDisplay(0.0) - StartLoop() - ShutdownLoadingScreen() - ShutdownLoadingScreenNui() - TriggerEvent('esx:loadingScreenOff') - Citizen.Wait(200) - TriggerServerEvent("esx_multicharacter:SetupCharacters") - end) - - StartLoop = function() - hidePlayers = true - MumbleSetVolumeOverride(PlayerId(), 0.0) - Citizen.CreateThread(function() - local keys = {18, 27, 172, 173, 174, 175, 176, 177, 187, 188, 191, 201, 108, 109} - while hidePlayers do - DisableAllControlActions(0) - for i = 1, #keys do - EnableControlAction(0, keys[i], true) - end - SetEntityVisible(PlayerPedId(), 0, 0) - SetLocalPlayerVisibleLocally(1) - SetPlayerInvincible(PlayerId(), 1) - ThefeedHideThisFrame() - HideHudComponentThisFrame(11) - HideHudComponentThisFrame(12) - HideHudComponentThisFrame(21) - HideHudAndRadarThisFrame() - Citizen.Wait(0) - local vehicles = GetGamePool('CVehicle') - for i = 1, #vehicles do - SetEntityLocallyInvisible(vehicles[i]) - end - end - local playerId, playerPed = PlayerId(), PlayerPedId() - MumbleSetVolumeOverride(playerId, -1.0) - SetEntityVisible(playerPed, 1, 0) - SetPlayerInvincible(playerId, 0) - FreezeEntityPosition(playerPed, false) - Citizen.Wait(10000) - canRelog = true - end) - Citizen.CreateThread(function() - local playerPool = {} - while hidePlayers do - local players = GetActivePlayers() - for i = 1, #players do - local player = players[i] - if player ~= PlayerId() and not playerPool[player] then - playerPool[player] = true - NetworkConcealPlayer(player, true, true) - end - end - Citizen.Wait(500) - end - for k in pairs(playerPool) do - NetworkConcealPlayer(k, false, false) - end - end) - end - - SetupCharacter = function(index) - if spawned == false then - exports.spawnmanager:spawnPlayer({ - x = Config.Spawn.x, - y = Config.Spawn.y, - z = Config.Spawn.z, - heading = Config.Spawn.w, - model = Characters[index].model or `mp_m_freemode_01`, - skipFade = true - }, function() - canRelog = false - if Characters[index] then - local skin = Characters[index].skin or Config.Default - if not Characters[index].model then - if Characters[index].sex == _('female') then skin.sex = 1 else skin.sex = 0 end - end - TriggerEvent('skinchanger:loadSkin', skin) - end - DoScreenFadeIn(400) - end) - repeat Citizen.Wait(200) until not IsScreenFadedOut() - - elseif Characters[index] and Characters[index].skin then - if Characters[spawned] and Characters[spawned].model then - RequestModel(Characters[index].model) - while not HasModelLoaded(Characters[index].model) do - RequestModel(Characters[index].model) - Citizen.Wait(0) - end - SetPlayerModel(PlayerId(), Characters[index].model) - SetModelAsNoLongerNeeded(Characters[index].model) - end - TriggerEvent('skinchanger:loadSkin', Characters[index].skin) - end - spawned = index - local playerPed = PlayerPedId() - FreezeEntityPosition(PlayerPedId(), true) - SetPedAoBlobRendering(playerPed, true) - SetEntityAlpha(playerPed, 255) - SendNUIMessage({ - action = "openui", - character = Characters[spawned] - }) - end - - RegisterNetEvent('esx_multicharacter:SetupUI') - AddEventHandler('esx_multicharacter:SetupUI', function(data, slots) - DoScreenFadeOut(0) - Characters = data - slots = slots - local elements = {} - local Character = next(Characters) - exports.spawnmanager:forceRespawn() - - if Character == nil then - SendNUIMessage({ - action = "closeui" - }) - exports.spawnmanager:spawnPlayer({ - x = Config.Spawn.x, - y = Config.Spawn.y, - z = Config.Spawn.z, - heading = Config.Spawn.w, - model = `mp_m_freemode_01`, - skipFade = true - }, function() - canRelog = false - DoScreenFadeIn(400) - Citizen.Wait(400) - local playerPed = PlayerPedId() - SetPedAoBlobRendering(playerPed, false) - SetEntityAlpha(playerPed, 0) - TriggerServerEvent('esx_multicharacter:CharacterChosen', 1, true) - TriggerEvent('esx_identity:showRegisterIdentity') - end) - else - for k,v in pairs(Characters) do - if not v.model and v.skin then - if v.skin.model then v.model = v.skin.model elseif v.skin.sex == 1 then v.model = `mp_f_freemode_01` else v.model = `mp_m_freemode_01` end - end - if spawned == false then SetupCharacter(Character) end - local label = v.firstname..' '..v.lastname - if Characters[k].disabled then - elements[#elements+1] = {label = label, value = v.id} - else - elements[#elements+1] = {label = label, value = v.id} - end - end - if #elements < slots then - elements[#elements+1] = {label = _('create_char'), value = (#elements+1), new = true} - end - ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'selectchar', { - title = _('select_char'), - align = 'top-left', - elements = elements - }, function(data, menu) - local elements = {} - if not data.current.new then - if not Characters[data.current.value].disabled then - elements[1] = {label = _('char_play'), action = 'play', value = data.current.value} - else - elements[1] = {label = _('char_disabled'), value = data.current.value} - end - if Config.CanDelete then elements[2] = {label = _('char_delete'), action = 'delete', value = data.current.value} end - ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'choosechar', { - title = _('select_char'), - align = 'top-left', - elements = elements - }, function(data, menu) - if data.current.action == 'play' then - ESX.UI.Menu.CloseAll() - SendNUIMessage({ - action = "closeui" - }) - TriggerServerEvent('esx_multicharacter:CharacterChosen', data.current.value, false) - elseif data.current.action == 'delete' then - local elements2 = {} - elements2[1] = {label = _('cancel')} - elements2[2] = {label = _('confirm'), value = data.current.value} - ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'deletechar', { - title = _('delete_label', Characters[data.current.value].firstname, Characters[data.current.value].lastname), - align = 'center', - elements = elements2 - }, function(data, menu) - if data.current.value then - TriggerServerEvent('esx_multicharacter:DeleteCharacter', data.current.value) - spawned = false - ESX.UI.Menu.CloseAll() - else - menu.close() - end - end, function(data, menu) - menu.close() - end) - end - end, function(data, menu) - menu.close() - end) - else - ESX.UI.Menu.CloseAll() - local GetSlot = function() - for i = 1, slots do - if not Characters[i] then - return i - end - end - end - local slot = GetSlot() - TriggerServerEvent('esx_multicharacter:CharacterChosen', slot, true) - TriggerEvent('esx_identity:showRegisterIdentity') - end - end, function(data, menu) - menu.refresh() - end, function(data, menu) - if data.current.new then - local playerPed = PlayerPedId() - SetPedAoBlobRendering(playerPed, false) - SetEntityAlpha(playerPed, 0) - SendNUIMessage({ - action = "closeui" - }) - else - SetupCharacter(data.current.value) - local playerPed = PlayerPedId() - SetPedAoBlobRendering(playerPed, true) - ResetEntityAlpha(playerPed) - end - end) - end - end) - - RegisterNetEvent('esx:playerLoaded') - AddEventHandler('esx:playerLoaded', function(playerData, isNew, skin) - local spawn = playerData.coords or Config.Spawn - 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) - while not HasModelLoaded(model) do - RequestModel(model) - Citizen.Wait(0) - end - SetPlayerModel(PlayerId(), model) - SetModelAsNoLongerNeeded(model) - skin = Config.Default - skin.sex = sex - TriggerEvent('skinchanger:loadSkin', skin, function() - playerPed = PlayerPedId() - SetPedAoBlobRendering(playerPed, true) - ResetEntityAlpha(playerPed) - TriggerEvent('esx_skin:openSaveableMenu', function() - finished = true end, function() finished = true - end) - end) - repeat Citizen.Wait(200) until finished - end - DoScreenFadeOut(100) - - SetCamActive(cam, false) - RenderScriptCams(false, false, 0, true, true) - cam = nil - local playerPed = PlayerPedId() - FreezeEntityPosition(playerPed, true) - SetEntityCoordsNoOffset(playerPed, spawn.x, spawn.y, spawn.z, false, false, false, true) - 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') - TriggerEvent('esx:restoreLoadout') - Characters, hidePlayers = {}, false - end) - - RegisterNetEvent('esx:onPlayerLogout') - AddEventHandler('esx:onPlayerLogout', function() - DoScreenFadeOut(0) - spawned = false - TriggerEvent("esx_multicharacter:SetupCharacters") - TriggerEvent('esx_skin:resetFirstSpawn') - end) - - if Config.Relog then - RegisterCommand('relog', function(source, args, rawCommand) - if canRelog == true then - canRelog = false - TriggerServerEvent('esx_multicharacter:relog') - ESX.SetTimeout(10000, function() - canRelog = true - end) - end - end) - end - -end diff --git a/[esx]/esx_multicharacter/config.lua b/[esx]/esx_multicharacter/config.lua deleted file mode 100644 index fe18b776..00000000 --- a/[esx]/esx_multicharacter/config.lua +++ /dev/null @@ -1,129 +0,0 @@ -Config = {} -Config.Locale = 'en' - --- Allows players to delete their characters -Config.CanDelete = true - -if IsDuplicityVersion() then - -- This is the default number of slots for EVERY player - -- If you want to manage extra slots for specific players you can do it by using '/setslots' and '/remslots' commands - Config.Slots = 4 - -------------------- - - -- Text to prepend to each character (char#:identifier) - keep it short - Config.Prefix = 'char' - -------------------- - - -- Default identifier to store for characters - this should always match es_extended (recommended: license) - Config.Identifier = 'license' - -else - -- Sets the location for the character selection scene - -- To set the spawn location for new characters, modify the default value in the `users` SQL table - Config.Spawn = vector4(-113.7, 565.3, 195.2, 0) - -------------------- - - -- Do not use unless you are prepared to adjust your resources to correctly reset data - -- Information: https://github.com/thelindat/esx_multicharacter#relogging - Config.Relog = true - -------------------- - - -- Default appearance for new characters - Config.Default = { - mom = 21, - dad = 0, - face_md_weight = 50, - skin_md_weight = 50, - nose_1 = 0, - nose_2 = 0, - nose_3 = 0, - nose_4 = 0, - nose_5 = 0, - nose_6 = 0, - cheeks_1 = 0, - cheeks_2 = 0, - cheeks_3 = 0, - lip_thickness = 0, - jaw_1 = 0, - jaw_2 = 0, - chin_1 = 0, - chin_2 = 0, - chin_13 = 0, - chin_4 = 0, - neck_thickness = 0, - hair_1 = 0, - hair_2 = 0, - hair_color_1 = 0, - hair_color_2 = 0, - tshirt_1 = 0, - tshirt_2 = 0, - torso_1 = 0, - torso_2 = 0, - decals_1 = 0, - decals_2 = 0, - arms = 0, - arms_2 = 0, - pants_1 = 0, - pants_2 = 0, - shoes_1 = 0, - shoes_2 = 0, - mask_1 = 0, - mask_2 = 0, - bproof_1 = 0, - bproof_2 = 0, - chain_1 = 0, - chain_2 = 0, - helmet_1 = -1, - helmet_2 = 0, - glasses_1 = 0, - glasses_2 = 0, - watches_1 = -1, - watches_2 = 0, - bracelets_1 = -1, - bracelets_2 = 0, - bags_1 = 0, - bags_2 = 0, - eye_color = 0, - eye_squint = 0, - eyebrows_2 = 0, - eyebrows_1 = 0, - eyebrows_3 = 0, - eyebrows_4 = 0, - eyebrows_5 = 0, - eyebrows_6 = 0, - makeup_1 = 0, - makeup_2 = 0, - makeup_3 = 0, - makeup_4 = 0, - lipstick_1 = 0, - lipstick_2 = 0, - lipstick_3 = 0, - lipstick_4 = 0, - ears_1 = -1, - ears_2 = 0, - chest_1 = 0, - chest_2 = 0, - chest_3 = 0, - bodyb_1 = -1, - bodyb_2 = 0, - bodyb_3 = -1, - bodyb_4 = 0, - age_1 = 0, - age_2 = 0, - blemishes_1 = 0, - blemishes_2 = 0, - blush_1 = 0, - blush_2 = 0, - blush_3 = 0, - complexion_1 = 0, - complexion_2 = 0, - sun_1 = 0, - sun_2 = 0, - moles_1 = 0, - moles_2 = 0, - beard_1 = 0, - beard_2 = 0, - beard_3 = 0, - beard_4 = 0 - } -end \ No newline at end of file diff --git a/[esx]/esx_multicharacter/esx_multicharacter.sql b/[esx]/esx_multicharacter/esx_multicharacter.sql deleted file mode 100644 index f19f7610..00000000 --- a/[esx]/esx_multicharacter/esx_multicharacter.sql +++ /dev/null @@ -1,9 +0,0 @@ -CREATE TABLE `multicharacter_slots` ( - `identifier` VARCHAR(60) NOT NULL, - `slots` INT(11) NOT NULL, - PRIMARY KEY (`identifier`) USING BTREE, - INDEX `slots` (`slots`) USING BTREE -) ENGINE=InnoDB; - -ALTER TABLE `users` ADD COLUMN - `disabled` TINYINT(1) NULL DEFAULT '0'; diff --git a/[esx]/esx_multicharacter/fxmanifest.lua b/[esx]/esx_multicharacter/fxmanifest.lua deleted file mode 100644 index 435f6ba3..00000000 --- a/[esx]/esx_multicharacter/fxmanifest.lua +++ /dev/null @@ -1,39 +0,0 @@ -fx_version 'cerulean' -game 'gta5' -description 'Official Multicharacter System For ESX Legacy' -version '1.6.5' -lua54 'yes' - -dependencies { - 'es_extended', - 'esx_menu_default', - 'esx_identity', - 'esx_skin' -} - -shared_scripts { - '@es_extended/locale.lua', - 'locales/*.lua', - 'config.lua' -} - -server_scripts { - '@es_extended/imports.lua', - '@oxmysql/lib/MySQL.lua', - 'server/*.lua', -} - -client_scripts { - 'client/*.lua' -} - -ui_page { - 'html/ui.html', -} - -files { - 'html/ui.html', - 'html/css/main.css', - 'html/js/app.js', - 'html/locales/*.js', -} diff --git a/[esx]/esx_multicharacter/html/css/main.css b/[esx]/esx_multicharacter/html/css/main.css deleted file mode 100644 index 15fb9bc5..00000000 --- a/[esx]/esx_multicharacter/html/css/main.css +++ /dev/null @@ -1,70 +0,0 @@ -@import url('https://fonts.googleapis.com/css2?family=Raleway:wght@300;600&display=swap'); -* { - margin: 0; - padding: 0; - user-select: none; - color: rgb(255, 255, 255); - font-weight: 300; - font-size: 1.6vh; - font-family: Calibri, "Helvetica", san-serif; -} - -html { - overflow: hidden; -} - -p { - margin: 0 !important; -} - -body { - background: transparent; -} - -.main-container { - display:none; - position: absolute; - top: 50%; - right: 25; - transform: translate(0, -50%); - background: rgba(0,0,0,0.7); -} - -.header { - position: absolute; - top: 5%; - left: 50%; - transform: translate(-50%); - font-size: 1.1rem; -} - -.footer { - position: absolute; - bottom: 5%; - left: 50%; - transform: translate(-50%); - font-size: 1.1rem; -} - -.character-box { - display: flex; - right: 0; - flex-direction: column; - justify-content: center; - align-items: center; - text-align: center; - line-height: 1.4rem; - height: calc(100vh - 6rem); - width: 20rem; - padding: 1rem; - border: 1px rgba(12,12,12,200) solid; - box-shadow: 0px 0px 4px 1px rgba(12,12,12,20); -} - -h1 { - font-family: 'Raleway', sans-serif; - padding-top: 2rem; - display: block; - font-size: 1.3rem; - font-weight: 600; -} diff --git a/[esx]/esx_multicharacter/html/js/app.js b/[esx]/esx_multicharacter/html/js/app.js deleted file mode 100644 index 22b5c92c..00000000 --- a/[esx]/esx_multicharacter/html/js/app.js +++ /dev/null @@ -1,35 +0,0 @@ -var money = Intl.NumberFormat('en-US', { - style: 'currency', - currency: 'USD', - minimumFractionDigits: 0 -}); - -(() => { - Kashacter = {}; - - Kashacter.ShowUI = function(data) { - $('body').css({"display":"block"}); - $('.main-container').css({"display":"block"}); - $('[data-charid=1]').html('

' + `${translate.name} ` + '

' + data.firstname +' '+ data.lastname +'

' + `${translate.job} ` + '

'+ data.job +' '+ data.job_grade +'

' + `${translate.money} ` + '

'+ money.format(data.money) +'

' + `${translate.bank} ` + '

'+ money.format(data.bank) +'

' + `${translate.dob} ` + '

'+ data.dateofbirth +'

' + `${translate.gender} ` + '

'+ data.sex +'

').attr("data-ischar", "true"); - }; - - Kashacter.CloseUI = function() { - $('body').css({"display":"none"}); - $('.main-container').css({"display":"none"}); - $('[data-charid=1]').html('

'); - }; - - window.onload = function(e) { - window.addEventListener('message', function(event) { - switch(event.data.action) { - case 'openui': - Kashacter.ShowUI(event.data.character); - break; - case 'closeui': - Kashacter.CloseUI(); - break; - } - }) - } - -})(); diff --git a/[esx]/esx_multicharacter/html/locales/cs.js b/[esx]/esx_multicharacter/html/locales/cs.js deleted file mode 100644 index cc84dedc..00000000 --- a/[esx]/esx_multicharacter/html/locales/cs.js +++ /dev/null @@ -1,8 +0,0 @@ -const translate = new Object(); - -translate.name = "Jméno"; -translate.job = "Práce"; -translate.bank = "Banka"; -translate.money = "Peníze"; -translate.gender = "Pohlaví"; -translate.dob = "Datum narození"; diff --git a/[esx]/esx_multicharacter/html/locales/de.js b/[esx]/esx_multicharacter/html/locales/de.js deleted file mode 100644 index efd17188..00000000 --- a/[esx]/esx_multicharacter/html/locales/de.js +++ /dev/null @@ -1,8 +0,0 @@ -const translate = new Object(); - -translate.name = "Name"; -translate.job = "Beruf"; -translate.bank = "Bankguthaben"; -translate.money = "Bargeld"; -translate.gender = "Geschlecht"; -translate.dob = "Geburtsdatum"; diff --git a/[esx]/esx_multicharacter/html/locales/en.js b/[esx]/esx_multicharacter/html/locales/en.js deleted file mode 100644 index 125dd3f0..00000000 --- a/[esx]/esx_multicharacter/html/locales/en.js +++ /dev/null @@ -1,8 +0,0 @@ -const translate = new Object(); - -translate.name = "Name"; -translate.job = "Job"; -translate.bank = "Bank"; -translate.money = "Cash"; -translate.gender = "Gender"; -translate.dob = "Date of birth"; diff --git a/[esx]/esx_multicharacter/html/locales/fr.js b/[esx]/esx_multicharacter/html/locales/fr.js deleted file mode 100644 index 597a217d..00000000 --- a/[esx]/esx_multicharacter/html/locales/fr.js +++ /dev/null @@ -1,8 +0,0 @@ -const translate = new Object(); - -translate.name = "Nom"; -translate.job = "Métier"; -translate.bank = "Banque"; -translate.money = "Argent"; -translate.gender = "Sexe"; -translate.dob = "Date de naissance"; diff --git a/[esx]/esx_multicharacter/html/locales/pl.js b/[esx]/esx_multicharacter/html/locales/pl.js deleted file mode 100644 index 07b27356..00000000 --- a/[esx]/esx_multicharacter/html/locales/pl.js +++ /dev/null @@ -1,8 +0,0 @@ -const translate = new Object(); - -translate.name = "imię"; -translate.job = "Zajęcie"; -translate.bank = "Bank"; -translate.money = "Gotówka"; -translate.gender = "Seks"; -translate.dob = "Data urodzenia"; diff --git a/[esx]/esx_multicharacter/html/locales/pt.js b/[esx]/esx_multicharacter/html/locales/pt.js deleted file mode 100644 index c8eca4f8..00000000 --- a/[esx]/esx_multicharacter/html/locales/pt.js +++ /dev/null @@ -1,8 +0,0 @@ -const translate = new Object(); - -translate.name = "Nome"; -translate.job = "Trabalho"; -translate.bank = "Banco"; -translate.money = "Dinheiro"; -translate.gender = "Género"; -translate.dob = "Data de Nascimento"; diff --git a/[esx]/esx_multicharacter/html/locales/tr.js b/[esx]/esx_multicharacter/html/locales/tr.js deleted file mode 100644 index ab820732..00000000 --- a/[esx]/esx_multicharacter/html/locales/tr.js +++ /dev/null @@ -1,8 +0,0 @@ -const translate = new Object(); - -translate.name = "İsim"; -translate.job = "Meslek"; -translate.bank = "Banka"; -translate.money = "Nakit"; -translate.gender = "Cinsiyet"; -translate.dob = "Doğum Tarihi"; diff --git a/[esx]/esx_multicharacter/html/ui.html b/[esx]/esx_multicharacter/html/ui.html deleted file mode 100644 index 7b59ac89..00000000 --- a/[esx]/esx_multicharacter/html/ui.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - -
-
ESX Legacy
-
-

-
-
-
Multicharacter
-
- - - - - - \ No newline at end of file diff --git a/[esx]/esx_multicharacter/locales/cs.lua b/[esx]/esx_multicharacter/locales/cs.lua deleted file mode 100644 index d309e309..00000000 --- a/[esx]/esx_multicharacter/locales/cs.lua +++ /dev/null @@ -1,25 +0,0 @@ -Locales['cs'] = { - ['male'] = "Muž", - ['female'] = "Žena", - ['delete_label'] = "Vymazat %s %s?", - ['select_char'] = "Zvolit Postavu", - ['create_char'] = "Vytvořit Novou Postavu", - ['char_play'] = "Hrát za postavu", - ['char_disabled'] = "Tato postava je zakázána!", - ['char_delete'] = "Vymazat postavu", - ['cancel'] = "Zrušit", - ['confirm'] = "Potvrdit", - ['command_setslots'] = "Nastavit slot pro hráče v multicharacteru", - ['command_remslots'] = "Odebrat slot pro hráče v multicharacteru", - ['command_enablechar'] = "Povolit zovlený slot hráči", - ['command_disablechar'] = "Zakázat zvolený slot pro hračé", - ['command_charslot'] = "Číslo slotu", - ['command_identifier'] = "Identifier hráče", - ['command_slots'] = "# ze slotu", - ['slotsadd'] = "Přidal slot %s hráči %s", - ['slotsedit'] = "Nastavil si slot %s hráči %s", - ['slotsrem'] = "Odebral si slot %s", - ['charenabled'] = "Povolol si postavu #%s z %s", - ['chardisabled'] = "Zakázal si postavu #%s z %s", - ['charnotfound'] = "Postava #%s z %s nebyla nalezena/neexistuje", -} diff --git a/[esx]/esx_multicharacter/locales/de.lua b/[esx]/esx_multicharacter/locales/de.lua deleted file mode 100644 index 654971af..00000000 --- a/[esx]/esx_multicharacter/locales/de.lua +++ /dev/null @@ -1,11 +0,0 @@ -Locales['de'] = { - ['male'] = "Männlich", - ['female'] = "Weiblich", - ['delete_label'] = "Lösche %s %s?", - ['select_char'] = "Charakter auswählen", - ['create_char'] = "Neuen Charakter erstellen", - ['char_play'] = "Diesen Charakter spielen", - ['char_delete'] = "Diesen Charakter löschen", - ['cancel'] = "Abbrechen", - ['confirm'] = "Bestätigen", -} diff --git a/[esx]/esx_multicharacter/locales/en.lua b/[esx]/esx_multicharacter/locales/en.lua deleted file mode 100644 index b71de307..00000000 --- a/[esx]/esx_multicharacter/locales/en.lua +++ /dev/null @@ -1,25 +0,0 @@ -Locales['en'] = { - ['male'] = "Male", - ['female'] = "Female", - ['delete_label'] = "Delete %s %s?", - ['select_char'] = "Select Character", - ['create_char'] = "Create new character", - ['char_play'] = "Play this character", - ['char_disabled'] = "This character is disabled", - ['char_delete'] = "Delete this character", - ['cancel'] = "Cancel", - ['confirm'] = "Confirm", - ['command_setslots'] = "Set multicharacter slots number of a player", - ['command_remslots'] = "Remove multicharacter slots number of a player", - ['command_enablechar'] = "Enable a given character of a player", - ['command_disablechar'] = "Disable a given character of a player", - ['command_charslot'] = "Slot number of the character", - ['command_identifier'] = "Player identifier", - ['command_slots'] = "# of slots", - ['slotsadd'] = "You added %s slots to %s", - ['slotsedit'] = "You set %s slots to %s", - ['slotsrem'] = "You removed slots to %s", - ['charenabled'] = "You enabled character #%s of %s", - ['chardisabled'] = "You disabled character #%s of %s", - ['charnotfound'] = "Character #%s of %s doesn't exist", -} diff --git a/[esx]/esx_multicharacter/locales/it.lua b/[esx]/esx_multicharacter/locales/it.lua deleted file mode 100644 index 1f2333e5..00000000 --- a/[esx]/esx_multicharacter/locales/it.lua +++ /dev/null @@ -1,25 +0,0 @@ -Locales['it'] = { - ['male'] = "Maschio", - ['female'] = "Femmina", - ['delete_label'] = "Cancella %s %s?", - ['select_char'] = "Seleziona Personaggio", - ['create_char'] = "Crea un nuovo personaggio", - ['char_play'] = "Gioca questo personaggio", - ['char_disabled'] = "Questo personaggio è disabilitato", - ['char_delete'] = "Cancella questo personaggio", - ['cancel'] = "Annulla", - ['confirm'] = "Conferma", - ['command_setslots'] = "Imposta il numero di slot di personaggi di un giocatore", - ['command_remslots'] = "Rimuovi il numero di slot di personaggi di un giocatore", - ['command_enablechar'] = "Abilita un personaggio di un giocatore", - ['command_disablechar'] = "Disabilita un personaggio di un giocatore", - ['command_charslot'] = "Numero dello slot del personaggio", - ['command_identifier'] = "Identifier del giocatore", - ['command_slots'] = "# di slot", - ['slotsadd'] = "Hai aggiunto %s slot a %s", - ['slotsedit'] = "Hai impostato %s slot a %s", - ['slotsrem'] = "Hai rimosso gli slot a %s", - ['charenabled'] = "Hai abilitato il %s° personaggio di %s", - ['chardisabled'] = "Hai disabilitato il %s° personaggio di %s", - ['charnotfound'] = "Il personaggio %s di %s non esiste", -} diff --git a/[esx]/esx_multicharacter/locales/pt.lua b/[esx]/esx_multicharacter/locales/pt.lua deleted file mode 100644 index 04b828a3..00000000 --- a/[esx]/esx_multicharacter/locales/pt.lua +++ /dev/null @@ -1,11 +0,0 @@ -Locales['pt'] = { - ['male'] = "Masculino", - ['female'] = "Feminino", - ['delete_label'] = "Eliminar %s %s?", - ['select_char'] = "Selecionar personagem", - ['create_char'] = "Criar novo personagem", - ['char_play'] = "Selecionar", - ['char_delete'] = "Eliminar personagem", - ['cancel'] = "Cancelar", - ['confirm'] = "Confirmar", -} diff --git a/[esx]/esx_multicharacter/locales/tr.lua b/[esx]/esx_multicharacter/locales/tr.lua deleted file mode 100644 index 8a3aa060..00000000 --- a/[esx]/esx_multicharacter/locales/tr.lua +++ /dev/null @@ -1,11 +0,0 @@ -Locales['tr'] = { - ['male'] = "Erkek", - ['female'] = "Kadın", - ['delete_label'] = "Sil %s %s?", - ['select_char'] = "Karakter Seç", - ['create_char'] = "Yeni Karakter Oluştur", - ['char_play'] = "Bu Karakterle Oyna", - ['char_delete'] = "Bu Karakteri Sil", - ['cancel'] = "İptal", - ['confirm'] = "Onayla", -} diff --git a/[esx]/esx_multicharacter/readme.md b/[esx]/esx_multicharacter/readme.md deleted file mode 100644 index f5879edc..00000000 --- a/[esx]/esx_multicharacter/readme.md +++ /dev/null @@ -1,59 +0,0 @@ - -# Preview - -![image](https://user-images.githubusercontent.com/65407488/126976325-17cc3241-bb9e-451f-a6ed-610a8ef52fa5.png) - -## Installation - -- Modify your ESX config with `Config.Multichar = true` -- All owner and identifier columns should be set to `VARCHAR(60)` to ensure correct data entry - - The resource will attempt to set columns automatically - -### Relogging - -- Do not enable this setting if you do not intend to properly set up relog support -- Requires the latest update for ESX Status (prevents multiple status ticks from running) -- Add the following events to resources that require support for relogging, or -- Add them to [@es_extended/imports.lua](https://github.com/esx-framework/esx-legacy/blob/main/[esx]/es_extended/imports.lua) (and use the imports in your resources) - -```lua -RegisterNetEvent('esx:playerLoaded', function(xPlayer) - ESX.PlayerData = xPlayer - ESX.PlayerLoaded = true -end) - -RegisterNetEvent('esx:onPlayerLogout', function() - ESX.PlayerLoaded = false - ESX.PlayerData = {} -end) -``` - -### Notes - -- Characters are stored in the users table as `char#:license` - if you need to use a different identifier then you need to modify ESX itself -- Character deletion does not require manual entries for the tables to remove -- As characters are stored with unique identifiers, there is no excessive queries being executed - -### Kashacters - -- This project is forked from the [kashacters multicharacter resource](https://github.com/FiveEYZ/esx_kashacter) -- Most of the code has been entirely rewritten -- KASH has given permission for this resource to use his code and the addition of a license -- The license obviously does not apply to previous versions and KASH has stated his resource is free to be used however - -## Notice - -Copyright © 2022 [Linden](https://github.com/thelindat/), ESX-Framework (fournier Brice & Jérémie N'gadi) and KASH - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . diff --git a/[esx]/esx_multicharacter/server/commands.lua b/[esx]/esx_multicharacter/server/commands.lua deleted file mode 100644 index 3cfa98d5..00000000 --- a/[esx]/esx_multicharacter/server/commands.lua +++ /dev/null @@ -1,79 +0,0 @@ -ESX.RegisterCommand('setslots', 'admin', function(xPlayer, args, showError) - local slots = MySQL.scalar('SELECT `slots` FROM `multicharacter_slots` WHERE identifier = ?', { - args.identifier - }) - - if slots == nil then - MySQL.update('INSERT INTO `multicharacter_slots` (`identifier`, `slots`) VALUES (?, ?)', { - args.identifier, - args.slots - }) - xPlayer.triggerEvent('esx:showNotification', _U('slotsadd', args.slots, args.identifier)) - else - MySQL.update('UPDATE `multicharacter_slots` SET `slots` = ? WHERE `identifier` = ?', { - args.slots, - args.identifier - }) - xPlayer.triggerEvent('esx:showNotification', _U('slotsedit', args.slots, args.identifier)) - end -end, true, {help = _U('command_setslots'), validate = true, arguments = { - {name = 'identifier', help = _U('command_identifier'), type = 'string'}, - {name = 'slots', help = _U('command_slots'), type = 'number'} -}}) - -ESX.RegisterCommand('remslots', 'admin', function(xPlayer, args, showError) - local slots = MySQL.scalar('SELECT `slots` FROM `multicharacter_slots` WHERE identifier = ?', { - args.identifier - }) - - if slots ~= nil then - MySQL.update('DELETE FROM `multicharacter_slots` WHERE `identifier` = ?', { - args.identifier - }) - xPlayer.triggerEvent('esx:showNotification', _U('slotsrem', args.identifier)) - end -end, true, {help = _U('command_remslots'), validate = true, arguments = { - {name = 'identifier', help = _U('command_identifier'), type = 'string'} -}}) - -ESX.RegisterCommand('enablechar', 'admin', function(xPlayer, args, showError) - - local selectedCharacter = 'char'..args.charslot..':'..args.identifier; - - MySQL.update('UPDATE `users` SET `disabled` = 0 WHERE identifier = ?', { - selectedCharacter - }, function(result) - if result > 0 then - xPlayer.triggerEvent('esx:showNotification', _U('charenabled', args.charslot, args.identifier)) - else - xPlayer.triggerEvent('esx:showNotification', _U('charnotfound', args.charslot, args.identifier)) - end - end) - -end, true, {help = _U('command_enablechar'), validate = true, arguments = { - {name = 'identifier', help = _U('command_identifier'), type = 'string'}, - {name = 'charslot', help = _U('command_charslot'), type = 'number'} -}}) - -ESX.RegisterCommand('disablechar', 'admin', function(xPlayer, args, showError) - - local selectedCharacter = 'char'..args.charslot..':'..args.identifier; - - MySQL.update('UPDATE `users` SET `disabled` = 1 WHERE identifier = ?', { - selectedCharacter - }, function(result) - if result > 0 then - xPlayer.triggerEvent('esx:showNotification', _U('chardisabled', args.charslot, args.identifier)) - else - xPlayer.triggerEvent('esx:showNotification', _U('charnotfound', args.charslot, args.identifier)) - end - end) - -end, true, {help = _U('command_disablechar'), validate = true, arguments = { - {name = 'identifier', help = _U('command_identifier'), type = 'string'}, - {name = 'charslot', help = _U('command_charslot'), type = 'number'} -}}) - -RegisterCommand('forcelog', function(source, args, rawCommand) - TriggerEvent('esx:playerLogout', source) -end, true) diff --git a/[esx]/esx_multicharacter/server/main.lua b/[esx]/esx_multicharacter/server/main.lua deleted file mode 100644 index 266c560c..00000000 --- a/[esx]/esx_multicharacter/server/main.lua +++ /dev/null @@ -1,221 +0,0 @@ -if not ESX then - error('\n^1Unable to start Multicharacter - you must be using ESX Legacy^0') -elseif ESX.GetConfig().Multichar == true then - local DATABASE do - local connectionString = GetConvar('mysql_connection_string', ''); - if connectionString == '' then - error(connectionString..'\n^1Unable to start Multicharacter - unable to determine database from mysql_connection_string^0', 0) - elseif connectionString:find('mysql://') then - connectionString = connectionString:sub(9, -1) - DATABASE = connectionString:sub(connectionString:find('/')+1, -1):gsub('[%?]+[%w%p]*$', '') - else - connectionString = {string.strsplit(';', connectionString)} - for i = 1, #connectionString do - local v = connectionString[i] - if v:match('database') then - DATABASE = v:sub(10, #v) - end - end - end - end - - local DB_TABLES = {users = 'identifier'} - local FETCH = nil - local SLOTS = Config.Slots or 4 - local PREFIX = Config.Prefix or 'char' - local PRIMARY_IDENTIFIER = ESX.GetConfig().Identifier or GetConvar('sv_lan', '') == 'true' and 'ip' or Config.Identifier - - local function GetIdentifier(source) - local identifier = PRIMARY_IDENTIFIER..':' - for _, v in pairs(GetPlayerIdentifiers(source)) do - if string.match(v, identifier) then - identifier = string.gsub(v, identifier, '') - return identifier - end - end - end - - if next(ESX.Players) then - local players = table.clone(ESX.Players) - table.wipe(ESX.Players) - for _, v in pairs(players) do - ESX.Players[GetIdentifier(v.source)] = true - end - else ESX.Players = {} end - - local function SetupCharacters(source) - while not FETCH do Citizen.Wait(100) end - local identifier = GetIdentifier(source) - ESX.Players[identifier] = true - - local slots = MySQL.scalar.await('SELECT slots FROM multicharacter_slots WHERE identifier = ?', { identifier }) or SLOTS - identifier = PREFIX..'%:'..identifier - - local result = MySQL.query.await(FETCH, {identifier, slots}) - local characters - - if result then - local characterCount = #result - characters = table.create(0, characterCount) - - for i = 1, characterCount, 1 do - local v = result[i] - local job, grade = v.job or 'unemployed', tostring(v.job_grade) - - if ESX.Jobs[job] and ESX.Jobs[job].grades[grade] then - if job ~= 'unemployed' then grade = ESX.Jobs[job].grades[grade].label else grade = '' end - job = ESX.Jobs[job].label - end - - local accounts = json.decode(v.accounts) - local id = tonumber(string.sub(v.identifier, #PREFIX+1, string.find(v.identifier, ':')-1)) - - characters[id] = { - id = id, - bank = accounts.bank, - money = accounts.money, - job = job, - job_grade = grade, - firstname = v.firstname, - lastname = v.lastname, - dateofbirth = v.dateofbirth, - skin = v.skin and json.decode(v.skin) or {}, - disabled = v.disabled, - sex = v.sex == 'm' and _('male') or _('female') - } - end - end - - TriggerClientEvent('esx_multicharacter:SetupUI', source, characters, slots) - end - - AddEventHandler('playerConnecting', function(playerName, setKickReason, deferrals) - deferrals.defer() - local identifier = GetIdentifier(source) - - if identifier then - if ESX.Players[identifier] then - deferrals.done(('A player is already connected to the server with this identifier.\nYour identifier: %s:%s'):format(PRIMARY_IDENTIFIER, identifier)) - else - deferrals.done() - end - else - deferrals.done(('Unable to retrieve player identifier.\nIdentifier type: %s'):format(PRIMARY_IDENTIFIER)) - end - end) - - local function DeleteCharacter(source, charid) - local identifier = ('%s%s:%s'):format(PREFIX, charid, GetIdentifier(source)) - local query = 'DELETE FROM %s WHERE %s = ?' - local queries = {} - local count = 0 - - for table, column in pairs(DB_TABLES) do - count += 1 - queries[count] = {query = query:format(table, column), values = {identifier}} - end - - MySQL.transaction(queries, function(result) - if result then - print(('[^2INFO^7] Player [%s] %s has deleted a character (%s)'):format(GetPlayerName(source), source, identifier)) - Citizen.Wait(50) - SetupCharacters(source) - else - error('\n^1Transaction failed while trying to delete '..identifier..'^0') - end - end) - end - - MySQL.ready(function() - local length = 42 + #PREFIX - local DB_COLUMNS = MySQL.query.await(('SELECT TABLE_NAME, COLUMN_NAME, CHARACTER_MAXIMUM_LENGTH FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = "%s" AND DATA_TYPE = "varchar" AND COLUMN_NAME IN (?)'):format(DATABASE, length), { - {'identifier', 'owner'} - }) - - if DB_COLUMNS then - local columns = {} - local count = 0 - - for i = 1, #DB_COLUMNS do - local v = DB_COLUMNS[i] - - if v?.CHARACTER_MAXIMUM_LENGTH ~= length then - count += 1 - columns[v.TABLE_NAME] = v.COLUMN_NAME - end - end - - if next(columns) then - local query = 'ALTER TABLE `%s` MODIFY COLUMN `%s` VARCHAR(%s)' - local queries = table.create(count, 0) - - for k, v in pairs(columns) do - queries[#queries+1] = {query = query:format(k, v, length)} - end - - if MySQL.transaction.await(queries) then - print(('[^2INFO^7] Updated ^5%s^7 columns to use VARCHAR(%s)'):format(count, length)) - else - print(('[^2INFO^7] Unable to update ^5%s^7 columns to use VARCHAR(%s)'):format(count, length)) - end - end - - ESX.Jobs = {} - - local function GetJobs() - if ESX.GetJobs then - return ESX.GetJobs() - end - return exports.es_extended:getSharedObject().Jobs - end - - repeat - ESX.Jobs = GetJobs() - Citizen.Wait(50) - until next(ESX.Jobs) - - FETCH = 'SELECT identifier, accounts, job, job_grade, firstname, lastname, dateofbirth, sex, skin, disabled FROM users WHERE identifier LIKE ? LIMIT ?' - end - end) - - RegisterNetEvent('esx_multicharacter:SetupCharacters', function() - SetupCharacters(source) - end) - - local awaitingRegistration = {} - - RegisterNetEvent('esx_multicharacter:CharacterChosen', function(charid, isNew) - if type(charid) == 'number' and string.len(charid) <= 2 and type(isNew) == 'boolean' then - if isNew then - awaitingRegistration[source] = charid - else - TriggerEvent('esx:onPlayerJoined', source, PREFIX..charid) - ESX.Players[GetIdentifier(source)] = true - end - end - end) - - AddEventHandler('esx_identity:completedRegistration', function(source, data) - TriggerEvent('esx:onPlayerJoined', source, PREFIX..awaitingRegistration[source], data) - awaitingRegistration[source] = nil - ESX.Players[GetIdentifier(source)] = true - end) - - AddEventHandler('playerDropped', function(reason) - awaitingRegistration[source] = nil - ESX.Players[GetIdentifier(source)] = nil - end) - - RegisterNetEvent('esx_multicharacter:DeleteCharacter', function(charid) - if Config.CanDelete and type(charid) == 'number' and string.len(charid) <= 2 then - DeleteCharacter(source, charid) - end - end) - - RegisterNetEvent('esx_multicharacter:relog', function() - TriggerEvent('esx:playerLogout', source) - end) - -else - assert(nil, '^3WARNING: Multicharacter is disabled - please check your ESX configuration^0') -end diff --git a/[esx]/esx_skin/fxmanifest.lua b/[esx]/esx_skin/fxmanifest.lua index 31b095d2..0feb09d3 100644 --- a/[esx]/esx_skin/fxmanifest.lua +++ b/[esx]/esx_skin/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Skin' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_accessories/fxmanifest.lua b/[esx_addons]/esx_accessories/fxmanifest.lua index d2fb53da..6acdf67a 100644 --- a/[esx_addons]/esx_accessories/fxmanifest.lua +++ b/[esx_addons]/esx_accessories/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Accessories' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_addonaccount/fxmanifest.lua b/[esx_addons]/esx_addonaccount/fxmanifest.lua index 7aacd820..8fd979bd 100644 --- a/[esx_addons]/esx_addonaccount/fxmanifest.lua +++ b/[esx_addons]/esx_addonaccount/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Addon Account' -version '1.6.5' +version '1.6.0' server_scripts { '@es_extended/imports.lua', diff --git a/[esx_addons]/esx_addoninventory/fxmanifest.lua b/[esx_addons]/esx_addoninventory/fxmanifest.lua index 404b109d..c8f0c790 100644 --- a/[esx_addons]/esx_addoninventory/fxmanifest.lua +++ b/[esx_addons]/esx_addoninventory/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Addon Inventory' -version '1.6.5' +version '1.6.0' server_scripts { '@es_extended/imports.lua', diff --git a/[esx_addons]/esx_ambulancejob/fxmanifest.lua b/[esx_addons]/esx_ambulancejob/fxmanifest.lua index 80444c35..5ff50452 100644 --- a/[esx_addons]/esx_ambulancejob/fxmanifest.lua +++ b/[esx_addons]/esx_ambulancejob/fxmanifest.lua @@ -4,9 +4,9 @@ game 'gta5' description 'ESX Ambulance Job' -version '1.6.5' +version '1.6.0' -c +shared_script '@es_extended/imports.lua' server_scripts { '@oxmysql/lib/MySQL.lua', diff --git a/[esx_addons]/esx_animations/fxmanifest.lua b/[esx_addons]/esx_animations/fxmanifest.lua index 70fd794c..1897459b 100644 --- a/[esx_addons]/esx_animations/fxmanifest.lua +++ b/[esx_addons]/esx_animations/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Animations' -version '1.6.5' +version '1.6.0' client_scripts { '@es_extended/imports.lua', diff --git a/[esx_addons]/esx_atm/fxmanifest.lua b/[esx_addons]/esx_atm/fxmanifest.lua index 9d6f4325..a464c619 100644 --- a/[esx_addons]/esx_atm/fxmanifest.lua +++ b/[esx_addons]/esx_atm/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Atm' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_bankerjob/fxmanifest.lua b/[esx_addons]/esx_bankerjob/fxmanifest.lua index d4259110..d60a7ca0 100644 --- a/[esx_addons]/esx_bankerjob/fxmanifest.lua +++ b/[esx_addons]/esx_bankerjob/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Banker job' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_barbershop/fxmanifest.lua b/[esx_addons]/esx_barbershop/fxmanifest.lua index 3859ec00..a83ae43e 100644 --- a/[esx_addons]/esx_barbershop/fxmanifest.lua +++ b/[esx_addons]/esx_barbershop/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Barber Shop' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_basicneeds/fxmanifest.lua b/[esx_addons]/esx_basicneeds/fxmanifest.lua index 6e5cf251..2088dd2d 100644 --- a/[esx_addons]/esx_basicneeds/fxmanifest.lua +++ b/[esx_addons]/esx_basicneeds/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Basic Needs' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_billing/fxmanifest.lua b/[esx_addons]/esx_billing/fxmanifest.lua index dbfbfdfc..56ef67ca 100644 --- a/[esx_addons]/esx_billing/fxmanifest.lua +++ b/[esx_addons]/esx_billing/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Billing' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_boat/fxmanifest.lua b/[esx_addons]/esx_boat/fxmanifest.lua index 0cb962ea..3a8c8fca 100644 --- a/[esx_addons]/esx_boat/fxmanifest.lua +++ b/[esx_addons]/esx_boat/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Boat' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_clotheshop/fxmanifest.lua b/[esx_addons]/esx_clotheshop/fxmanifest.lua index 41e7a38b..a8dd1b89 100644 --- a/[esx_addons]/esx_clotheshop/fxmanifest.lua +++ b/[esx_addons]/esx_clotheshop/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Clothes Shop' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_cruisecontrol/fxmanifest.lua b/[esx_addons]/esx_cruisecontrol/fxmanifest.lua index c6fa2dee..e92aa300 100644 --- a/[esx_addons]/esx_cruisecontrol/fxmanifest.lua +++ b/[esx_addons]/esx_cruisecontrol/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'CruiseControl System for ESX' -version '1.6.5' +version '1.6.0' dependencies { 'es_extended' diff --git a/[esx_addons]/esx_datastore/fxmanifest.lua b/[esx_addons]/esx_datastore/fxmanifest.lua index aa84426e..4f948458 100644 --- a/[esx_addons]/esx_datastore/fxmanifest.lua +++ b/[esx_addons]/esx_datastore/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Data Store' -version '1.6.5' +version '1.6.0' server_scripts { '@es_extended/imports.lua', diff --git a/[esx_addons]/esx_dmvschool/fxmanifest.lua b/[esx_addons]/esx_dmvschool/fxmanifest.lua index 726b5d16..433a2fb3 100644 --- a/[esx_addons]/esx_dmvschool/fxmanifest.lua +++ b/[esx_addons]/esx_dmvschool/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX DMV School' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_drugs/fxmanifest.lua b/[esx_addons]/esx_drugs/fxmanifest.lua index 45782bd6..45e910b1 100644 --- a/[esx_addons]/esx_drugs/fxmanifest.lua +++ b/[esx_addons]/esx_drugs/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Drugs' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_garage/fxmanifest.lua b/[esx_addons]/esx_garage/fxmanifest.lua index 28a0dc29..02614ad7 100644 --- a/[esx_addons]/esx_garage/fxmanifest.lua +++ b/[esx_addons]/esx_garage/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Garage' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_holdup/fxmanifest.lua b/[esx_addons]/esx_holdup/fxmanifest.lua index 52619849..1aec4396 100644 --- a/[esx_addons]/esx_holdup/fxmanifest.lua +++ b/[esx_addons]/esx_holdup/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Holdup' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_joblisting/fxmanifest.lua b/[esx_addons]/esx_joblisting/fxmanifest.lua index c5e4bd50..a910652f 100644 --- a/[esx_addons]/esx_joblisting/fxmanifest.lua +++ b/[esx_addons]/esx_joblisting/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Job Listing' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_jobs/fxmanifest.lua b/[esx_addons]/esx_jobs/fxmanifest.lua index 25d637af..8beb059a 100644 --- a/[esx_addons]/esx_jobs/fxmanifest.lua +++ b/[esx_addons]/esx_jobs/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Jobs' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_license/fxmanifest.lua b/[esx_addons]/esx_license/fxmanifest.lua index 9bef90a7..8d907995 100644 --- a/[esx_addons]/esx_license/fxmanifest.lua +++ b/[esx_addons]/esx_license/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX License' -version '1.6.5' +version '1.6.0' server_scripts { '@async/async.lua', diff --git a/[esx_addons]/esx_lscustom/fxmanifest.lua b/[esx_addons]/esx_lscustom/fxmanifest.lua index 19efd417..d6ec6779 100644 --- a/[esx_addons]/esx_lscustom/fxmanifest.lua +++ b/[esx_addons]/esx_lscustom/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX LS Customs' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_mechanicjob/fxmanifest.lua b/[esx_addons]/esx_mechanicjob/fxmanifest.lua index dfc4140a..4d24aeee 100644 --- a/[esx_addons]/esx_mechanicjob/fxmanifest.lua +++ b/[esx_addons]/esx_mechanicjob/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Mechanic Job' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_optionalneeds/fxmanifest.lua b/[esx_addons]/esx_optionalneeds/fxmanifest.lua index 2e788e88..f5793a9a 100644 --- a/[esx_addons]/esx_optionalneeds/fxmanifest.lua +++ b/[esx_addons]/esx_optionalneeds/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Optional Needs' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_phone/fxmanifest.lua b/[esx_addons]/esx_phone/fxmanifest.lua index c7f52a52..96733393 100644 --- a/[esx_addons]/esx_phone/fxmanifest.lua +++ b/[esx_addons]/esx_phone/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Phone' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_policejob/fxmanifest.lua b/[esx_addons]/esx_policejob/fxmanifest.lua index 6dd5ac08..60c00cf7 100644 --- a/[esx_addons]/esx_policejob/fxmanifest.lua +++ b/[esx_addons]/esx_policejob/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Police Job' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_property/fxmanifest.lua b/[esx_addons]/esx_property/fxmanifest.lua index 0ef6d6e9..dddedcc2 100644 --- a/[esx_addons]/esx_property/fxmanifest.lua +++ b/[esx_addons]/esx_property/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Property' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_realestateagentjob/fxmanifest.lua b/[esx_addons]/esx_realestateagentjob/fxmanifest.lua index 1dbccfd7..5201b2c8 100644 --- a/[esx_addons]/esx_realestateagentjob/fxmanifest.lua +++ b/[esx_addons]/esx_realestateagentjob/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Real Estate Job' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_rpchat/fxmanifest.lua b/[esx_addons]/esx_rpchat/fxmanifest.lua index 06774b5d..4d8ae670 100644 --- a/[esx_addons]/esx_rpchat/fxmanifest.lua +++ b/[esx_addons]/esx_rpchat/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX RP Chat' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_service/fxmanifest.lua b/[esx_addons]/esx_service/fxmanifest.lua index 9f49bd78..d271c37c 100644 --- a/[esx_addons]/esx_service/fxmanifest.lua +++ b/[esx_addons]/esx_service/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Service' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_shops/fxmanifest.lua b/[esx_addons]/esx_shops/fxmanifest.lua index fdf23909..9aebaf69 100644 --- a/[esx_addons]/esx_shops/fxmanifest.lua +++ b/[esx_addons]/esx_shops/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Shops' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_sit/fxmanifest.lua b/[esx_addons]/esx_sit/fxmanifest.lua index 2e971618..630b2898 100644 --- a/[esx_addons]/esx_sit/fxmanifest.lua +++ b/[esx_addons]/esx_sit/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Sit' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_society/fxmanifest.lua b/[esx_addons]/esx_society/fxmanifest.lua index 79fe1448..43769fd6 100644 --- a/[esx_addons]/esx_society/fxmanifest.lua +++ b/[esx_addons]/esx_society/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Society' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_status/fxmanifest.lua b/[esx_addons]/esx_status/fxmanifest.lua index 68bd5b3f..d4ebd2c7 100644 --- a/[esx_addons]/esx_status/fxmanifest.lua +++ b/[esx_addons]/esx_status/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Status' -version '1.6.5' +version '1.6.0' lua54 'yes' diff --git a/[esx_addons]/esx_taxijob/fxmanifest.lua b/[esx_addons]/esx_taxijob/fxmanifest.lua index 54e4ea72..b2e67b5f 100644 --- a/[esx_addons]/esx_taxijob/fxmanifest.lua +++ b/[esx_addons]/esx_taxijob/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Taxi Job' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_vehicleshop/fxmanifest.lua b/[esx_addons]/esx_vehicleshop/fxmanifest.lua index 82c483c0..f87595e3 100644 --- a/[esx_addons]/esx_vehicleshop/fxmanifest.lua +++ b/[esx_addons]/esx_vehicleshop/fxmanifest.lua @@ -6,7 +6,7 @@ lua54 'yes' description 'ESX Vehicle Shop' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua' diff --git a/[esx_addons]/esx_voice/fxmanifest.lua b/[esx_addons]/esx_voice/fxmanifest.lua index 9ffc0aeb..a8e2697a 100644 --- a/[esx_addons]/esx_voice/fxmanifest.lua +++ b/[esx_addons]/esx_voice/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Voice Controller' -version '1.6.5' +version '1.6.0' client_scripts { '@es_extended/imports.lua', diff --git a/[esx_addons]/esx_weaponshop/fxmanifest.lua b/[esx_addons]/esx_weaponshop/fxmanifest.lua index 64296bf3..65e74b5e 100644 --- a/[esx_addons]/esx_weaponshop/fxmanifest.lua +++ b/[esx_addons]/esx_weaponshop/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Weapon Shop' -version '1.6.5' +version '1.6.0' shared_scripts { '@es_extended/imports.lua', diff --git a/[esx_addons]/esx_whitelist/fxmanifest.lua b/[esx_addons]/esx_whitelist/fxmanifest.lua index 6319d5d9..8c6515e6 100644 --- a/[esx_addons]/esx_whitelist/fxmanifest.lua +++ b/[esx_addons]/esx_whitelist/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Whitelist' -version '1.6.5' +version '1.6.0' server_scripts { '@es_extended/imports.lua', diff --git a/[esx_addons]/instance/fxmanifest.lua b/[esx_addons]/instance/fxmanifest.lua index f5a4b905..57aa044e 100644 --- a/[esx_addons]/instance/fxmanifest.lua +++ b/[esx_addons]/instance/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'Instance' -version '1.6.5' +version '1.6.0' shared_script '@es_extended/imports.lua'