fix(qb-core): post-update recovery + centralizare notify 17mov_Hud
Restaurat jobs.lua din git (Quasar fork a suprascris joburile 17mov). Adăugat item map în items.lua (lipsea, rupt rv-maphold). Setat licences.driver = false în config.lua. Override QBCore.Functions.Notify + QBCore:Notify event → 17mov_Hud:ShowNotification (toate notificările merg automat prin 17mov_Hud).
This commit is contained in:
@@ -0,0 +1,674 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
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.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
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 <https://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program does terminal interaction, make it output a short
|
||||
notice like this when it starts in an interactive mode:
|
||||
|
||||
<program> Copyright (C) <year> <name of author>
|
||||
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
|
||||
<https://www.gnu.org/licenses/>.
|
||||
|
||||
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
|
||||
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||
@@ -0,0 +1,21 @@
|
||||
# qb-core
|
||||
|
||||
### [Official QBCore Documentation](https://docs.qbcore.org)
|
||||
|
||||
# License
|
||||
|
||||
QBCore Framework
|
||||
Copyright (C) 2015-2022 ESX (Jérémie N'gadi), Joshua Eger
|
||||
|
||||
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 <https://www.gnu.org/licenses/>
|
||||
@@ -1,57 +1,41 @@
|
||||
local function hideText()
|
||||
if GetResourceState("17mov_Hud") == "started" then
|
||||
exports["17mov_Hud"]:HideHelpNotification()
|
||||
else
|
||||
SendNUIMessage({
|
||||
action = 'HIDE_TEXT',
|
||||
})
|
||||
end
|
||||
SendNUIMessage({
|
||||
action = 'HIDE_TEXT',
|
||||
})
|
||||
end
|
||||
|
||||
local function drawText(text, position)
|
||||
if GetResourceState("17mov_Hud") == "started" then
|
||||
exports["17mov_Hud"]:ShowHelpNotification(text)
|
||||
else
|
||||
if type(position) ~= 'string' then position = 'left' end
|
||||
if type(position) ~= 'string' then position = 'left' end
|
||||
|
||||
SendNUIMessage({
|
||||
action = 'DRAW_TEXT',
|
||||
data = {
|
||||
text = text,
|
||||
position = position
|
||||
}
|
||||
})
|
||||
end
|
||||
SendNUIMessage({
|
||||
action = 'DRAW_TEXT',
|
||||
data = {
|
||||
text = text,
|
||||
position = position
|
||||
}
|
||||
})
|
||||
end
|
||||
|
||||
local function changeText(text, position)
|
||||
if GetResourceState("17mov_Hud") == "started" then
|
||||
exports["17mov_Hud"]:ShowHelpNotification(text)
|
||||
else
|
||||
if type(position) ~= 'string' then position = 'left' end
|
||||
if type(position) ~= 'string' then position = 'left' end
|
||||
|
||||
SendNUIMessage({
|
||||
action = 'CHANGE_TEXT',
|
||||
data = {
|
||||
text = text,
|
||||
position = position
|
||||
}
|
||||
})
|
||||
end
|
||||
SendNUIMessage({
|
||||
action = 'CHANGE_TEXT',
|
||||
data = {
|
||||
text = text,
|
||||
position = position
|
||||
}
|
||||
})
|
||||
end
|
||||
|
||||
local function keyPressed()
|
||||
if GetResourceState("17mov_Hud") == "started" then
|
||||
exports["17mov_Hud"]:HideHelpNotification()
|
||||
else
|
||||
CreateThread(function() -- Not sure if a thread is needed but why not eh?
|
||||
SendNUIMessage({
|
||||
action = 'KEY_PRESSED',
|
||||
})
|
||||
Wait(500)
|
||||
hideText()
|
||||
end)
|
||||
end
|
||||
CreateThread(function() -- Not sure if a thread is needed but why not eh?
|
||||
SendNUIMessage({
|
||||
action = 'KEY_PRESSED',
|
||||
})
|
||||
Wait(500)
|
||||
hideText()
|
||||
end)
|
||||
end
|
||||
|
||||
RegisterNetEvent('qb-core:client:DrawText', function(text, position)
|
||||
@@ -73,4 +57,4 @@ end)
|
||||
exports('DrawText', drawText)
|
||||
exports('ChangeText', changeText)
|
||||
exports('HideText', hideText)
|
||||
exports('KeyPressed', keyPressed)
|
||||
exports('KeyPressed', keyPressed)
|
||||
|
||||
@@ -19,6 +19,10 @@ RegisterNetEvent('QBCore:Client:PvpHasToggled', function(pvp_state)
|
||||
end)
|
||||
-- Teleport Commands
|
||||
|
||||
RegisterNetEvent('QBCore:Command:TeleportToPlayer', function(coords)
|
||||
local ped = PlayerPedId()
|
||||
SetPedCoordsKeepVehicle(ped, coords.x, coords.y, coords.z)
|
||||
end)
|
||||
|
||||
RegisterNetEvent('QBCore:Command:TeleportToCoords', function(x, y, z, h)
|
||||
local ped = PlayerPedId()
|
||||
@@ -26,6 +30,92 @@ RegisterNetEvent('QBCore:Command:TeleportToCoords', function(x, y, z, h)
|
||||
SetEntityHeading(ped, h or GetEntityHeading(ped))
|
||||
end)
|
||||
|
||||
RegisterNetEvent('QBCore:Command:GoToMarker', function()
|
||||
local PlayerPedId = PlayerPedId
|
||||
local GetEntityCoords = GetEntityCoords
|
||||
local GetGroundZFor_3dCoord = GetGroundZFor_3dCoord
|
||||
|
||||
local blipMarker <const> = GetFirstBlipInfoId(8)
|
||||
if not DoesBlipExist(blipMarker) then
|
||||
QBCore.Functions.Notify(Lang:t('error.no_waypoint'), 'error', 5000)
|
||||
return 'marker'
|
||||
end
|
||||
|
||||
-- Fade screen to hide how clients get teleported.
|
||||
DoScreenFadeOut(650)
|
||||
while not IsScreenFadedOut() do
|
||||
Wait(0)
|
||||
end
|
||||
|
||||
local ped, coords <const> = PlayerPedId(), GetBlipInfoIdCoord(blipMarker)
|
||||
local vehicle = GetVehiclePedIsIn(ped, false)
|
||||
local oldCoords <const> = GetEntityCoords(ped)
|
||||
|
||||
-- Unpack coords instead of having to unpack them while iterating.
|
||||
-- 825.0 seems to be the max a player can reach while 0.0 being the lowest.
|
||||
local x, y, groundZ, Z_START = coords['x'], coords['y'], 850.0, 950.0
|
||||
local found = false
|
||||
if vehicle > 0 then
|
||||
FreezeEntityPosition(vehicle, true)
|
||||
else
|
||||
FreezeEntityPosition(ped, true)
|
||||
end
|
||||
|
||||
for i = Z_START, 0, -25.0 do
|
||||
local z = i
|
||||
if (i % 2) ~= 0 then
|
||||
z = Z_START - i
|
||||
end
|
||||
|
||||
NewLoadSceneStart(x, y, z, x, y, z, 50.0, 0)
|
||||
local curTime = GetGameTimer()
|
||||
while IsNetworkLoadingScene() do
|
||||
if GetGameTimer() - curTime > 1000 then
|
||||
break
|
||||
end
|
||||
Wait(0)
|
||||
end
|
||||
NewLoadSceneStop()
|
||||
SetPedCoordsKeepVehicle(ped, x, y, z)
|
||||
|
||||
while not HasCollisionLoadedAroundEntity(ped) do
|
||||
RequestCollisionAtCoord(x, y, z)
|
||||
if GetGameTimer() - curTime > 1000 then
|
||||
break
|
||||
end
|
||||
Wait(0)
|
||||
end
|
||||
|
||||
-- Get ground coord. As mentioned in the natives, this only works if the client is in render distance.
|
||||
found, groundZ = GetGroundZFor_3dCoord(x, y, z, false);
|
||||
if found then
|
||||
Wait(0)
|
||||
SetPedCoordsKeepVehicle(ped, x, y, groundZ)
|
||||
break
|
||||
end
|
||||
Wait(0)
|
||||
end
|
||||
|
||||
-- Remove black screen once the loop has ended.
|
||||
DoScreenFadeIn(650)
|
||||
if vehicle > 0 then
|
||||
FreezeEntityPosition(vehicle, false)
|
||||
else
|
||||
FreezeEntityPosition(ped, false)
|
||||
end
|
||||
|
||||
if not found then
|
||||
-- If we can't find the coords, set the coords to the old ones.
|
||||
-- We don't unpack them before since they aren't in a loop and only called once.
|
||||
SetPedCoordsKeepVehicle(ped, oldCoords['x'], oldCoords['y'], oldCoords['z'] - 1.0)
|
||||
QBCore.Functions.Notify(Lang:t('error.tp_error'), 'error', 5000)
|
||||
end
|
||||
|
||||
-- If Z coord was found, set coords in found coords.
|
||||
SetPedCoordsKeepVehicle(ped, x, y, groundZ)
|
||||
QBCore.Functions.Notify(Lang:t('success.teleported_waypoint'), 'success', 5000)
|
||||
end)
|
||||
|
||||
-- Vehicle Commands
|
||||
|
||||
RegisterNetEvent('QBCore:Command:SpawnVehicle', function(vehName)
|
||||
@@ -48,9 +138,7 @@ RegisterNetEvent('QBCore:Command:SpawnVehicle', function(vehName)
|
||||
SetVehicleFuelLevel(vehicle, 100.0)
|
||||
SetVehicleDirtLevel(vehicle, 0.0)
|
||||
SetModelAsNoLongerNeeded(hash)
|
||||
local model = GetDisplayNameFromVehicleModel(GetEntityModel(veh))
|
||||
local plate = 'SPAWNVEH'
|
||||
exports['qs-vehiclekeys']:GiveKeys(plate, model, false)
|
||||
TriggerEvent('vehiclekeys:client:SetOwner', QBCore.Functions.GetPlate(vehicle))
|
||||
end)
|
||||
|
||||
RegisterNetEvent('QBCore:Command:DeleteVehicle', function()
|
||||
@@ -103,7 +191,8 @@ RegisterNetEvent('QBCore:Player:UpdatePlayerData', function()
|
||||
end)
|
||||
|
||||
RegisterNetEvent('QBCore:Notify', function(text, type, length, icon)
|
||||
QBCore.Functions.Notify(text, type, length, icon)
|
||||
-- RED VALLEY: Rutează TOATE notificările prin 17mov_Hud
|
||||
exports['17mov_Hud']:ShowNotification(text, type or 'info', nil, length or 5000)
|
||||
end)
|
||||
|
||||
-- This event is exploitable and should not be used. It has been deprecated, and will be removed soon.
|
||||
|
||||
@@ -68,7 +68,7 @@ function QBCore.Functions.LookAtEntity(entity, timeout, speed)
|
||||
return involved .. ' :^1 Entity must be a number'
|
||||
end
|
||||
if type(speed) ~= 'number' then
|
||||
return involved .. ' :^1 Speed must be a number'
|
||||
return involved .. ' :^1 Speed must be a number'
|
||||
end
|
||||
if speed > 5.0 then speed = 5.0 end
|
||||
if timeout > 5000 then timeout = 5000 end
|
||||
@@ -168,69 +168,38 @@ end
|
||||
|
||||
-- NUI Calls
|
||||
|
||||
local oldShowNotification = QBCore.Functions.Notify
|
||||
local lastNotifyMsg = nil
|
||||
local lastNotifyTime = 0
|
||||
local NOTIFY_COOLDOWN = 3000 -- 3 second cooldown for duplicate notifications
|
||||
|
||||
QBCore.Functions.Notify = function(text, texttype, length)
|
||||
local message, notifyTitle
|
||||
|
||||
if texttype == "primary" then texttype = "info" end
|
||||
|
||||
if type(text) == "table" then
|
||||
notifyTitle = text.caption
|
||||
message = text.text
|
||||
else
|
||||
message = text
|
||||
end
|
||||
|
||||
-- 3s cooldown for the same notification
|
||||
local now = GetGameTimer()
|
||||
if message == lastNotifyMsg and (now - lastNotifyTime) < NOTIFY_COOLDOWN then
|
||||
return
|
||||
end
|
||||
lastNotifyMsg = message
|
||||
lastNotifyTime = now
|
||||
|
||||
length = length or 5000
|
||||
|
||||
if GetResourceState("qs-notify") == "started" then
|
||||
exports["qs-notify"]:Alert(message, length, texttype or "info")
|
||||
elseif GetResourceState("17mov_Hud") == "started" then
|
||||
exports["17mov_Hud"]:ShowNotification(message, texttype, notifyTitle, length)
|
||||
else
|
||||
oldShowNotification(text, texttype, length)
|
||||
function QBCore.Functions.Notify(text, texttype, length, icon)
|
||||
-- RED VALLEY: Rutează TOATE notificările prin 17mov_Hud
|
||||
local message = text
|
||||
if type(text) == 'table' then
|
||||
message = text.text or 'Placeholder'
|
||||
end
|
||||
exports['17mov_Hud']:ShowNotification(message, texttype or 'info', nil, length or 5000)
|
||||
end
|
||||
|
||||
local oldProgressbar = QBCore.Functions.Progressbar
|
||||
|
||||
QBCore.Functions.Progressbar = function(name, label, duration, useWhileDead, canCancel, disableControls, animation, prop, propTwo, onFinish, onCancel)
|
||||
if GetResourceState("17mov_Hud") == "started" then
|
||||
exports["17mov_Hud"]:StartProgress({
|
||||
duration = duration,
|
||||
label = label,
|
||||
useWhileDead = useWhileDead,
|
||||
canCancel = canCancel,
|
||||
controlDisables = disableControls,
|
||||
animation = animation,
|
||||
prop = prop,
|
||||
propTwo = propTwo,
|
||||
}, nil, nil, function(cancelled)
|
||||
if not cancelled then
|
||||
if onFinish then
|
||||
onFinish()
|
||||
end
|
||||
else
|
||||
if onCancel then
|
||||
onCancel()
|
||||
end
|
||||
function QBCore.Functions.Progressbar(name, label, duration, useWhileDead, canCancel, disableControls, animation, prop, propTwo, onFinish, onCancel)
|
||||
if GetResourceState('progressbar') ~= 'started' then error('progressbar needs to be started in order for QBCore.Functions.Progressbar to work') end
|
||||
exports['progressbar']:Progress({
|
||||
name = name:lower(),
|
||||
duration = duration,
|
||||
label = label,
|
||||
useWhileDead = useWhileDead,
|
||||
canCancel = canCancel,
|
||||
controlDisables = disableControls,
|
||||
animation = animation,
|
||||
prop = prop,
|
||||
propTwo = propTwo,
|
||||
}, function(cancelled)
|
||||
if not cancelled then
|
||||
if onFinish then
|
||||
onFinish()
|
||||
end
|
||||
end)
|
||||
else
|
||||
oldProgressbar(name, label, duration, useWhileDead, canCancel, disableControls, animation, prop, propTwo, onFinish, onCancel)
|
||||
end
|
||||
else
|
||||
if onCancel then
|
||||
onCancel()
|
||||
end
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
-- World Getters
|
||||
@@ -875,16 +844,6 @@ end
|
||||
|
||||
function QBCore.Functions.DrawText(x, y, width, height, scale, r, g, b, a, text)
|
||||
-- Use local function instead
|
||||
x = tonumber(x) or 0.5
|
||||
y = tonumber(y) or 0.5
|
||||
width = tonumber(width) or 0.0
|
||||
height = tonumber(height) or 0.0
|
||||
scale = tonumber(scale) or 0.35
|
||||
r = tonumber(r) or 255
|
||||
g = tonumber(g) or 255
|
||||
b = tonumber(b) or 255
|
||||
a = tonumber(a) or 255
|
||||
text = text or ''
|
||||
SetTextFont(4)
|
||||
SetTextScale(scale, scale)
|
||||
SetTextColour(r, g, b, a)
|
||||
|
||||
@@ -9,7 +9,7 @@ QBConfig.Money = {}
|
||||
QBConfig.Money.MoneyTypes = { cash = 500, bank = 5000, crypto = 0 } -- type = startamount - Add or remove money types for your server (for ex. blackmoney = 0), remember once added it will not be removed from the database!
|
||||
QBConfig.Money.DontAllowMinus = { 'cash', 'crypto' } -- Money that is not allowed going in minus
|
||||
QBConfig.Money.MinusLimit = -5000 -- The maximum amount you can be negative
|
||||
QBConfig.Money.PayCheckTimeOut = 60 -- The time in minutes that it will give the paycheck
|
||||
QBConfig.Money.PayCheckTimeOut = 10 -- The time in minutes that it will give the paycheck
|
||||
QBConfig.Money.PayCheckSociety = false -- If true paycheck will come from the society account that the player is employed at, requires qb-management
|
||||
|
||||
QBConfig.Player = {}
|
||||
@@ -31,17 +31,17 @@ QBConfig.Player.PlayerDefaults = {
|
||||
end,
|
||||
optin = true,
|
||||
charinfo = {
|
||||
firstname = 'Prenume',
|
||||
lastname = 'Nume',
|
||||
firstname = 'Firstname',
|
||||
lastname = 'Lastname',
|
||||
birthdate = '00-00-0000',
|
||||
gender = 0,
|
||||
nationality = 'Romania',
|
||||
nationality = 'USA',
|
||||
phone = function() return QBCore.Functions.CreatePhoneNumber() end,
|
||||
account = function() return QBCore.Functions.CreateAccountNumber() end
|
||||
},
|
||||
job = {
|
||||
name = 'unemployed',
|
||||
label = 'Civil',
|
||||
label = 'Civilian',
|
||||
payment = 10,
|
||||
type = 'none',
|
||||
onduty = false,
|
||||
@@ -53,7 +53,7 @@ QBConfig.Player.PlayerDefaults = {
|
||||
},
|
||||
gang = {
|
||||
name = 'none',
|
||||
label = 'Fara Afiliere',
|
||||
label = 'No Gang Affiliation',
|
||||
isboss = false,
|
||||
grade = {
|
||||
name = 'none',
|
||||
@@ -75,7 +75,7 @@ QBConfig.Player.PlayerDefaults = {
|
||||
phone = {},
|
||||
rep = {},
|
||||
currentapartment = nil,
|
||||
callsign = 'FARA INDICATIV',
|
||||
callsign = 'NO CALLSIGN',
|
||||
bloodtype = function() return QBConfig.Player.Bloodtypes[math.random(1, #QBConfig.Player.Bloodtypes)] end,
|
||||
fingerprint = function() return QBCore.Player.CreateFingerId() end,
|
||||
walletid = function() return QBCore.Player.CreateWalletId() end,
|
||||
@@ -84,7 +84,7 @@ QBConfig.Player.PlayerDefaults = {
|
||||
date = nil
|
||||
},
|
||||
licences = {
|
||||
driver = false,
|
||||
driver = false, -- RED VALLEY: se obține de la școala de șoferi (bit-driverschool)
|
||||
business = false,
|
||||
weapon = false
|
||||
},
|
||||
@@ -106,7 +106,7 @@ QBConfig.Player.PlayerDefaults = {
|
||||
|
||||
QBConfig.Server = {} -- General server config
|
||||
QBConfig.Server.Closed = false -- Set server closed (no one can join except people with ace permission 'qbadmin.join')
|
||||
QBConfig.Server.ClosedReason = 'Server Inchis' -- Reason message to display when people can't join the server
|
||||
QBConfig.Server.ClosedReason = 'Server Closed' -- Reason message to display when people can't join the server
|
||||
QBConfig.Server.Uptime = 0 -- Time the server has been up.
|
||||
QBConfig.Server.Whitelist = false -- Enable or disable whitelist on the server
|
||||
QBConfig.Server.WhitelistPermission = 'admin' -- Permission that's able to enter the server when the whitelist is on
|
||||
|
||||
@@ -35,9 +35,7 @@ server_scripts {
|
||||
'server/events.lua',
|
||||
'server/commands.lua',
|
||||
'server/exports.lua',
|
||||
'server/debug.lua',
|
||||
'server/playtime-paycheck.lua',
|
||||
--[[server.lua]]
|
||||
'server/debug.lua'
|
||||
}
|
||||
|
||||
ui_page 'html/index.html'
|
||||
|
||||
@@ -4,123 +4,119 @@ Translation done by wanderrer (Martin Riggs#0807 on Discord)
|
||||
]]--
|
||||
local Translations = {
|
||||
error = {
|
||||
not_online = 'Jucatorul nu este online',
|
||||
not_online = 'Jucătorul nu este online',
|
||||
wrong_format = 'Format incorect',
|
||||
missing_args = 'Nu au fost introduse toate argumentele (x, y, z)',
|
||||
missing_args2 = 'Trebuie completate toate argumentele!',
|
||||
no_access = 'Nu ai acces la aceasta comanda',
|
||||
company_too_poor = 'Angajatorul tau este falit',
|
||||
item_not_exist = 'Obiectul nu exista',
|
||||
no_access = 'Nu ai acces la această comandă',
|
||||
company_too_poor = 'Angajatorul tău este falit',
|
||||
item_not_exist = 'Obiectul nu există',
|
||||
too_heavy = 'Inventarul este prea plin',
|
||||
location_not_exist = 'Locatia nu exista',
|
||||
duplicate_license = '[QBCORE] - Licenta Rockstar duplicata gasita',
|
||||
no_valid_license = 'Nicio licenta Rockstar valida gasita',
|
||||
not_whitelisted = 'Nu esti in lista alba pentru acest server',
|
||||
location_not_exist = 'Locația nu există',
|
||||
duplicate_license = 'Duplicate Rockstar License Found',
|
||||
no_valid_license = 'Nicio licență Rockstar validă găsită',
|
||||
not_whitelisted = 'Nu ești în lista albă pentru acest server',
|
||||
server_already_open = 'Serverul este deja deschis',
|
||||
server_already_closed = 'Serverul este deja inchis',
|
||||
server_already_closed = 'Serverul este deja închis',
|
||||
no_permission = 'Nu ai permisiuni pentru asta..',
|
||||
no_waypoint = 'Nu a fost setat un punct de referinta.',
|
||||
tp_error = 'Eroare in timpul teleportarii.',
|
||||
ban_table_not_found = '[QBCORE] - Nu s-a putut gasi tabelul de ban-uri in baza de date. Asigurati-va ca ati importat fisierul SQL corect.',
|
||||
connecting_database_error = '[QBCORE] - A aparut o eroare la conectarea la baza de date. Asigurati-va ca serverul SQL este pornit si ca detaliile din server.cfg sunt corecte.',
|
||||
connecting_database_timeout = '[QBCORE] - Conexiunea la baza de date a expirat. Asigurati-va ca serverul SQL este pornit si ca detaliile din server.cfg sunt corecte.',
|
||||
no_waypoint = 'Nu a fost setat un punct de referință.',
|
||||
tp_error = 'Eroare în timpul teleportării.',
|
||||
connecting_database_error = 'A apărut o eroare de bază de date în timpul conectării la server. (Este serverul SQL pornit?)',
|
||||
connecting_database_timeout = 'Conexiunea la baza de date a expirat. (Este serverul SQL pornit?)',
|
||||
},
|
||||
success = {
|
||||
server_opened = 'Serverul a fost deschis',
|
||||
server_closed = 'Serverul a fost inchis',
|
||||
teleported_waypoint = 'Teleportat la punctul de referinta.',
|
||||
server_closed = 'Serverul a fost închis',
|
||||
teleported_waypoint = 'Teleportat la punctul de referință.',
|
||||
},
|
||||
info = {
|
||||
received_paycheck = 'Ai primit salariul in valoare de $%{value}',
|
||||
job_info = 'Job: %{value} | Grad: %{value2} | Indatorire: %{value3}',
|
||||
gang_info = 'Banda: %{value} | Grad: %{value2}',
|
||||
on_duty = 'Esti in serviciu acum!',
|
||||
off_duty = 'Nu esti in serviciu acum!',
|
||||
checking_ban = 'Salut %s. Verificam daca esti interzis.',
|
||||
received_paycheck = 'Ai primit salariul în valoare de $%{value}',
|
||||
job_info = 'Job: %{value} | Grad: %{value2} | Îndatorire: %{value3}',
|
||||
gang_info = 'Bandă: %{value} | Grad: %{value2}',
|
||||
on_duty = 'Ești în serviciu acum!',
|
||||
off_duty = 'Nu ești în serviciu acum!',
|
||||
checking_ban = 'Salut %s. Verificăm dacă ești interzis.',
|
||||
join_server = 'Bun venit %s pe {Numele Serverului}.',
|
||||
checking_whitelisted = 'Salut %s. Verificam aprobarea ta.',
|
||||
exploit_banned = 'Ai fost interzis pentru inselaciune. Verifica Discord-ul nostru pentru mai multe informatii: %{discord}',
|
||||
exploit_dropped = 'Ai fost dat afara pentru exploatare',
|
||||
checking_whitelisted = 'Salut %s. Verificăm aprobarea ta.',
|
||||
exploit_banned = 'Ai fost interzis pentru înșelăciune. Verifică Discord-ul nostru pentru mai multe informații: %{discord}',
|
||||
exploit_dropped = 'Ai fost dat afară pentru exploatare',
|
||||
},
|
||||
command = {
|
||||
tp = {
|
||||
help = 'Teleporteaza la un jucator sau coordonate (doar pentru administrator)',
|
||||
help = 'Teleportează la un jucător sau coordonate (doar pentru administrator)',
|
||||
params = {
|
||||
x = { name = 'id/x', help = 'ID-ul jucatorului sau pozitia X' },
|
||||
y = { name = 'y', help = 'Pozitia Y' },
|
||||
z = { name = 'z', help = 'Pozitia Z' },
|
||||
x = { name = 'id/x', help = 'ID-ul jucătorului sau poziția X' },
|
||||
y = { name = 'y', help = 'Poziția Y' },
|
||||
z = { name = 'z', help = 'Poziția Z' },
|
||||
},
|
||||
},
|
||||
tpm = { help = 'Teleporteaza la marker (doar pentru administrator)' },
|
||||
togglepvp = { help = 'Activeaza/dezactiveaza PVP pe server (doar pentru administrator)' },
|
||||
tpm = { help = 'Teleportează la marker (doar pentru administrator)' },
|
||||
togglepvp = { help = 'Activează/dezactivează PVP pe server (doar pentru administrator)' },
|
||||
addpermission = {
|
||||
help = 'Acorda permisiuni jucatorului (doar pentru creator)',
|
||||
help = 'Acordă permisiuni jucătorului (doar pentru creator)',
|
||||
params = {
|
||||
id = { name = 'id', help = 'ID-ul jucatorului' },
|
||||
id = { name = 'id', help = 'ID-ul jucătorului' },
|
||||
permission = { name = 'permission', help = 'Nivelul permisiunii' },
|
||||
},
|
||||
},
|
||||
removepermission = {
|
||||
help = 'Elimina permisiunile jucatorului (doar pentru creator)',
|
||||
help = 'Elimină permisiunile jucătorului (doar pentru creator)',
|
||||
params = {
|
||||
id = { name = 'id', help = 'ID-ul jucatorului' },
|
||||
id = { name = 'id', help = 'ID-ul jucătorului' },
|
||||
permission = { name = 'permission', help = 'Nivelul permisiunii' },
|
||||
},
|
||||
},
|
||||
openserver = { help = 'Deschide serverul pentru toti (doar pentru administrator)' },
|
||||
openserver = { help = 'Deschide serverul pentru toți (doar pentru administrator)' },
|
||||
closeserver = {
|
||||
help = 'Inchide serverul pentru persoanele fara permisiuni (doar pentru administrator)',
|
||||
help = 'Închide serverul pentru persoanele fără permisiuni (doar pentru administrator)',
|
||||
params = {
|
||||
reason = { name = 'reason', help = 'Motivul inchiderii (optional)' },
|
||||
reason = { name = 'reason', help = 'Motivul închiderii (opțional)' },
|
||||
},
|
||||
},
|
||||
car = {
|
||||
help = 'Genereaza vehicul (doar pentru administrator)',
|
||||
help = 'Generează vehicul (doar pentru administrator)',
|
||||
params = {
|
||||
model = { name = 'model', help = 'Numele modelului vehiculului' },
|
||||
},
|
||||
},
|
||||
dv = { help = 'Sterge vehicul (doar pentru administrator)' },
|
||||
dvall = { help = 'Sterge toate vehiculele (doar pentru administrator)' },
|
||||
dvp = { help = 'Sterge toti NPC-ii (doar pentru administrator)' },
|
||||
dvo = { help = 'Sterge toate obiectele (doar pentru administrator)' },
|
||||
dv = { help = 'Șterge vehicul (doar pentru administrator)' },
|
||||
givemoney = {
|
||||
help = 'Da bani unui jucator (doar pentru administrator)',
|
||||
help = 'Dă bani unui jucător (doar pentru administrator)',
|
||||
params = {
|
||||
id = { name = 'id', help = 'ID-ul jucatorului' },
|
||||
moneytype = { name = 'moneytype', help = 'Tipul de bani (cash, banca, criptomonede)' },
|
||||
id = { name = 'id', help = 'ID-ul jucătorului' },
|
||||
moneytype = { name = 'moneytype', help = 'Tipul de bani (cash, bancă, criptomonede)' },
|
||||
amount = { name = 'amount', help = 'Suma de bani' },
|
||||
},
|
||||
},
|
||||
setmoney = {
|
||||
help = 'Seteaza suma de bani a unui jucator (doar pentru administrator)',
|
||||
help = 'Setează suma de bani a unui jucător (doar pentru administrator)',
|
||||
params = {
|
||||
id = { name = 'id', help = 'ID-ul jucatorului' },
|
||||
moneytype = { name = 'moneytype', help = 'Tipul de bani (cash, banca, criptomonede)' },
|
||||
id = { name = 'id', help = 'ID-ul jucătorului' },
|
||||
moneytype = { name = 'moneytype', help = 'Tipul de bani (cash, bancă, criptomonede)' },
|
||||
amount = { name = 'amount', help = 'Suma de bani' },
|
||||
},
|
||||
},
|
||||
job = { help = 'Verifica-ti jobul' },
|
||||
job = { help = 'Verifică-ți jobul' },
|
||||
setjob = {
|
||||
help = 'Seteaza jobul unui jucator (doar pentru administrator)',
|
||||
help = 'Setează jobul unui jucător (doar pentru administrator)',
|
||||
params = {
|
||||
id = { name = 'id', help = 'ID-ul jucatorului' },
|
||||
id = { name = 'id', help = 'ID-ul jucătorului' },
|
||||
job = { name = 'job', help = 'Numele jobului' },
|
||||
grade = { name = 'grade', help = 'Gradul jobului' },
|
||||
},
|
||||
},
|
||||
gang = { help = 'Verifica-ti banda' },
|
||||
gang = { help = 'Verifică-ți banda' },
|
||||
setgang = {
|
||||
help = 'Seteaza banda unui jucator (doar pentru administrator)',
|
||||
help = 'Setează banda unui jucător (doar pentru administrator)',
|
||||
params = {
|
||||
id = { name = 'id', help = 'ID-ul jucatorului' },
|
||||
gang = { name = 'gang', help = 'Numele bandei' },
|
||||
grade = { name = 'grade', help = 'Gradul bandei' },
|
||||
id = { name = 'id', help = 'ID-ul jucătorului' },
|
||||
gang = { name = 'gang', help = 'Numele băndei' },
|
||||
grade = { name = 'grade', help = 'Gradul băndei' },
|
||||
},
|
||||
},
|
||||
ooc = { help = 'Mesaj chat OOC' },
|
||||
me = {
|
||||
help = 'Afiseaza un mesaj local',
|
||||
help = 'Afișează un mesaj local',
|
||||
params = {
|
||||
message = { name = 'message', help = 'Mesajul de trimis' }
|
||||
},
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
CREATE TABLE IF NOT EXISTS `players` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`citizenid` varchar(50) NOT NULL,
|
||||
`cid` int(11) DEFAULT NULL,
|
||||
`license` varchar(255) NOT NULL,
|
||||
`name` varchar(255) NOT NULL,
|
||||
`money` text NOT NULL,
|
||||
`charinfo` text DEFAULT NULL,
|
||||
`job` text NOT NULL,
|
||||
`gang` text DEFAULT NULL,
|
||||
`position` text NOT NULL,
|
||||
`metadata` text NOT NULL,
|
||||
`inventory` longtext DEFAULT NULL,
|
||||
`last_updated` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
|
||||
PRIMARY KEY (`citizenid`),
|
||||
KEY `id` (`id`),
|
||||
KEY `last_updated` (`last_updated`),
|
||||
KEY `license` (`license`)
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=1;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `bans` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`name` varchar(50) DEFAULT NULL,
|
||||
`license` varchar(50) DEFAULT NULL,
|
||||
`discord` varchar(50) DEFAULT NULL,
|
||||
`ip` varchar(50) DEFAULT NULL,
|
||||
`reason` text DEFAULT NULL,
|
||||
`expire` int(11) DEFAULT NULL,
|
||||
`bannedby` varchar(255) NOT NULL DEFAULT 'LeBanhammer',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `license` (`license`),
|
||||
KEY `discord` (`discord`),
|
||||
KEY `ip` (`ip`)
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=1;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `player_contacts` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`citizenid` varchar(50) DEFAULT NULL,
|
||||
`name` varchar(50) DEFAULT NULL,
|
||||
`number` varchar(50) DEFAULT NULL,
|
||||
`iban` varchar(50) NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `citizenid` (`citizenid`)
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=1;
|
||||
@@ -81,8 +81,25 @@ function QBCore.Commands.Refresh(source)
|
||||
end
|
||||
|
||||
-- Teleport
|
||||
QBCore.Commands.Add('tpc', Lang:t('command.tp.help'), { { name = Lang:t('command.tp.params.x.name'), help = Lang:t('command.tp.params.x.help') }, { name = Lang:t('command.tp.params.y.name'), help = Lang:t('command.tp.params.y.help') }, { name = Lang:t('command.tp.params.z.name'), help = Lang:t('command.tp.params.z.help') } }, false, function(source, args)
|
||||
|
||||
QBCore.Commands.Add('tp', Lang:t('command.tp.help'), { { name = Lang:t('command.tp.params.x.name'), help = Lang:t('command.tp.params.x.help') }, { name = Lang:t('command.tp.params.y.name'), help = Lang:t('command.tp.params.y.help') }, { name = Lang:t('command.tp.params.z.name'), help = Lang:t('command.tp.params.z.help') } }, false, function(source, args)
|
||||
if args[1] and not args[2] and not args[3] then
|
||||
if tonumber(args[1]) then
|
||||
local target = GetPlayerPed(tonumber(args[1]))
|
||||
if target ~= 0 then
|
||||
local coords = GetEntityCoords(target)
|
||||
TriggerClientEvent('QBCore:Command:TeleportToPlayer', source, coords)
|
||||
else
|
||||
TriggerClientEvent('QBCore:Notify', source, Lang:t('error.not_online'), 'error')
|
||||
end
|
||||
else
|
||||
local location = QBShared.Locations[args[1]]
|
||||
if location then
|
||||
TriggerClientEvent('QBCore:Command:TeleportToCoords', source, location.x, location.y, location.z, location.w)
|
||||
else
|
||||
TriggerClientEvent('QBCore:Notify', source, Lang:t('error.location_not_exist'), 'error')
|
||||
end
|
||||
end
|
||||
else
|
||||
if args[1] and args[2] and args[3] then
|
||||
local x = tonumber((args[1]:gsub(',', ''))) + .0
|
||||
local y = tonumber((args[2]:gsub(',', ''))) + .0
|
||||
@@ -96,6 +113,16 @@ QBCore.Commands.Add('tpc', Lang:t('command.tp.help'), { { name = Lang:t('command
|
||||
else
|
||||
TriggerClientEvent('QBCore:Notify', source, Lang:t('error.missing_args'), 'error')
|
||||
end
|
||||
end
|
||||
end, 'admin')
|
||||
|
||||
QBCore.Commands.Add('tpm', Lang:t('command.tpm.help'), {}, false, function(source)
|
||||
TriggerClientEvent('QBCore:Command:GoToMarker', source)
|
||||
end, 'admin')
|
||||
|
||||
QBCore.Commands.Add('togglepvp', Lang:t('command.togglepvp.help'), {}, false, function()
|
||||
QBCore.Config.Server.PVP = not QBCore.Config.Server.PVP
|
||||
TriggerClientEvent('QBCore:Client:PvpHasToggled', -1, QBCore.Config.Server.PVP)
|
||||
end, 'admin')
|
||||
|
||||
-- Permissions
|
||||
@@ -120,12 +147,58 @@ QBCore.Commands.Add('removepermission', Lang:t('command.removepermission.help'),
|
||||
end
|
||||
end, 'god')
|
||||
|
||||
-- Open & Close Server
|
||||
|
||||
QBCore.Commands.Add('openserver', Lang:t('command.openserver.help'), {}, false, function(source)
|
||||
if not QBCore.Config.Server.Closed then
|
||||
TriggerClientEvent('QBCore:Notify', source, Lang:t('error.server_already_open'), 'error')
|
||||
return
|
||||
end
|
||||
if QBCore.Functions.HasPermission(source, 'admin') then
|
||||
QBCore.Config.Server.Closed = false
|
||||
TriggerClientEvent('QBCore:Notify', source, Lang:t('success.server_opened'), 'success')
|
||||
else
|
||||
QBCore.Functions.Kick(source, Lang:t('error.no_permission'), nil, nil)
|
||||
end
|
||||
end, 'admin')
|
||||
|
||||
QBCore.Commands.Add('closeserver', Lang:t('command.closeserver.help'), { { name = Lang:t('command.closeserver.params.reason.name'), help = Lang:t('command.closeserver.params.reason.help') } }, false, function(source, args)
|
||||
if QBCore.Config.Server.Closed then
|
||||
TriggerClientEvent('QBCore:Notify', source, Lang:t('error.server_already_closed'), 'error')
|
||||
return
|
||||
end
|
||||
if QBCore.Functions.HasPermission(source, 'admin') then
|
||||
local reason = args[1] or 'No reason specified'
|
||||
QBCore.Config.Server.Closed = true
|
||||
QBCore.Config.Server.ClosedReason = reason
|
||||
for k in pairs(QBCore.Players) do
|
||||
if not QBCore.Functions.HasPermission(k, QBCore.Config.Server.WhitelistPermission) then
|
||||
QBCore.Functions.Kick(k, reason, nil, nil)
|
||||
end
|
||||
end
|
||||
TriggerClientEvent('QBCore:Notify', source, Lang:t('success.server_closed'), 'success')
|
||||
else
|
||||
QBCore.Functions.Kick(source, Lang:t('error.no_permission'), nil, nil)
|
||||
end
|
||||
end, 'admin')
|
||||
|
||||
-- Vehicle
|
||||
|
||||
QBCore.Commands.Add('car', Lang:t('command.car.help'), { { name = Lang:t('command.car.params.model.name'), help = Lang:t('command.car.params.model.help') } }, true, function(source, args)
|
||||
TriggerClientEvent('QBCore:Command:SpawnVehicle', source, args[1])
|
||||
end, 'admin')
|
||||
|
||||
QBCore.Commands.Add('dv', Lang:t('command.dv.help'), {}, false, function(source)
|
||||
TriggerClientEvent('QBCore:Command:DeleteVehicle', source)
|
||||
end, 'admin')
|
||||
|
||||
QBCore.Commands.Add('dvall', Lang:t('command.dvall.help'), {}, false, function()
|
||||
local vehicles = GetAllVehicles()
|
||||
for _, vehicle in ipairs(vehicles) do
|
||||
DeleteEntity(vehicle)
|
||||
end
|
||||
end, 'admin')
|
||||
|
||||
-- Peds
|
||||
|
||||
QBCore.Commands.Add('dvp', Lang:t('command.dvp.help'), {}, false, function()
|
||||
@@ -144,9 +217,107 @@ QBCore.Commands.Add('dvo', Lang:t('command.dvo.help'), {}, false, function()
|
||||
end
|
||||
end, 'admin')
|
||||
|
||||
-- Money
|
||||
|
||||
QBCore.Commands.Add('givemoney', Lang:t('command.givemoney.help'), { { name = Lang:t('command.givemoney.params.id.name'), help = Lang:t('command.givemoney.params.id.help') }, { name = Lang:t('command.givemoney.params.moneytype.name'), help = Lang:t('command.givemoney.params.moneytype.help') }, { name = Lang:t('command.givemoney.params.amount.name'), help = Lang:t('command.givemoney.params.amount.help') } }, true, function(source, args)
|
||||
local Player = QBCore.Functions.GetPlayer(tonumber(args[1]))
|
||||
if Player then
|
||||
Player.Functions.AddMoney(tostring(args[2]), tonumber(args[3]), 'Admin give money')
|
||||
else
|
||||
TriggerClientEvent('QBCore:Notify', source, Lang:t('error.not_online'), 'error')
|
||||
end
|
||||
end, 'admin')
|
||||
|
||||
QBCore.Commands.Add('setmoney', Lang:t('command.setmoney.help'), { { name = Lang:t('command.setmoney.params.id.name'), help = Lang:t('command.setmoney.params.id.help') }, { name = Lang:t('command.setmoney.params.moneytype.name'), help = Lang:t('command.setmoney.params.moneytype.help') }, { name = Lang:t('command.setmoney.params.amount.name'), help = Lang:t('command.setmoney.params.amount.help') } }, true, function(source, args)
|
||||
local Player = QBCore.Functions.GetPlayer(tonumber(args[1]))
|
||||
if Player then
|
||||
Player.Functions.SetMoney(tostring(args[2]), tonumber(args[3]))
|
||||
else
|
||||
TriggerClientEvent('QBCore:Notify', source, Lang:t('error.not_online'), 'error')
|
||||
end
|
||||
end, 'admin')
|
||||
|
||||
-- Job
|
||||
|
||||
QBCore.Commands.Add('job', Lang:t('command.job.help'), {}, false, function(source)
|
||||
local PlayerJob = QBCore.Functions.GetPlayer(source).PlayerData.job
|
||||
TriggerClientEvent('QBCore:Notify', source, Lang:t('info.job_info', { value = PlayerJob.label, value2 = PlayerJob.grade.name, value3 = PlayerJob.onduty }))
|
||||
end, 'user')
|
||||
end, 'user')
|
||||
|
||||
QBCore.Commands.Add('setjob', Lang:t('command.setjob.help'), { { name = Lang:t('command.setjob.params.id.name'), help = Lang:t('command.setjob.params.id.help') }, { name = Lang:t('command.setjob.params.job.name'), help = Lang:t('command.setjob.params.job.help') }, { name = Lang:t('command.setjob.params.grade.name'), help = Lang:t('command.setjob.params.grade.help') } }, true, function(source, args)
|
||||
local Player = QBCore.Functions.GetPlayer(tonumber(args[1]))
|
||||
if Player then
|
||||
Player.Functions.SetJob(tostring(args[2]), tonumber(args[3]))
|
||||
else
|
||||
TriggerClientEvent('QBCore:Notify', source, Lang:t('error.not_online'), 'error')
|
||||
end
|
||||
end, 'admin')
|
||||
|
||||
-- Gang
|
||||
|
||||
QBCore.Commands.Add('gang', Lang:t('command.gang.help'), {}, false, function(source)
|
||||
local PlayerGang = QBCore.Functions.GetPlayer(source).PlayerData.gang
|
||||
TriggerClientEvent('QBCore:Notify', source, Lang:t('info.gang_info', { value = PlayerGang.label, value2 = PlayerGang.grade.name }))
|
||||
end, 'user')
|
||||
|
||||
QBCore.Commands.Add('setgang', Lang:t('command.setgang.help'), { { name = Lang:t('command.setgang.params.id.name'), help = Lang:t('command.setgang.params.id.help') }, { name = Lang:t('command.setgang.params.gang.name'), help = Lang:t('command.setgang.params.gang.help') }, { name = Lang:t('command.setgang.params.grade.name'), help = Lang:t('command.setgang.params.grade.help') } }, true, function(source, args)
|
||||
local Player = QBCore.Functions.GetPlayer(tonumber(args[1]))
|
||||
if Player then
|
||||
Player.Functions.SetGang(tostring(args[2]), tonumber(args[3]))
|
||||
else
|
||||
TriggerClientEvent('QBCore:Notify', source, Lang:t('error.not_online'), 'error')
|
||||
end
|
||||
end, 'admin')
|
||||
|
||||
-- Out of Character Chat
|
||||
QBCore.Commands.Add('ooc', Lang:t('command.ooc.help'), {}, false, function(source, args)
|
||||
local message = table.concat(args, ' ')
|
||||
local Players = QBCore.Functions.GetPlayers()
|
||||
local Player = QBCore.Functions.GetPlayer(source)
|
||||
local playerCoords = GetEntityCoords(GetPlayerPed(source))
|
||||
for _, v in pairs(Players) do
|
||||
if v == source then
|
||||
TriggerClientEvent('chat:addMessage', v, {
|
||||
color = QBCore.Config.Commands.OOCColor,
|
||||
multiline = true,
|
||||
args = { 'OOC | ' .. GetPlayerName(source), message }
|
||||
})
|
||||
elseif #(playerCoords - GetEntityCoords(GetPlayerPed(v))) < 20.0 then
|
||||
TriggerClientEvent('chat:addMessage', v, {
|
||||
color = QBCore.Config.Commands.OOCColor,
|
||||
multiline = true,
|
||||
args = { 'OOC | ' .. GetPlayerName(source), message }
|
||||
})
|
||||
elseif QBCore.Functions.HasPermission(v, 'admin') then
|
||||
if QBCore.Functions.IsOptin(v) then
|
||||
TriggerClientEvent('chat:addMessage', v, {
|
||||
color = QBCore.Config.Commands.OOCColor,
|
||||
multiline = true,
|
||||
args = { 'Proximity OOC | ' .. GetPlayerName(source), message }
|
||||
})
|
||||
TriggerEvent('qb-log:server:CreateLog', 'ooc', 'OOC', 'white', '**' .. GetPlayerName(source) .. '** (CitizenID: ' .. Player.PlayerData.citizenid .. ' | ID: ' .. source .. ') **Message:** ' .. message, false)
|
||||
end
|
||||
end
|
||||
end
|
||||
end, 'user')
|
||||
|
||||
-- Me command
|
||||
|
||||
QBCore.Commands.Add('me', Lang:t('command.me.help'), { { name = Lang:t('command.me.params.message.name'), help = Lang:t('command.me.params.message.help') } }, false, function(source, args)
|
||||
if #args < 1 then
|
||||
TriggerClientEvent('QBCore:Notify', source, Lang:t('error.missing_args2'), 'error')
|
||||
return
|
||||
end
|
||||
local ped = GetPlayerPed(source)
|
||||
local pCoords = GetEntityCoords(ped)
|
||||
local msg = table.concat(args, ' '):gsub('[~<].-[>~]', '')
|
||||
local Players = QBCore.Functions.GetPlayers()
|
||||
for i = 1, #Players do
|
||||
local Player = Players[i]
|
||||
local target = GetPlayerPed(Player)
|
||||
local tCoords = GetEntityCoords(target)
|
||||
if target == ped or #(pCoords - tCoords) < 20 then
|
||||
TriggerClientEvent('QBCore:Command:ShowMe3D', Player, source, msg)
|
||||
end
|
||||
end
|
||||
end, 'user')
|
||||
|
||||
@@ -25,13 +25,7 @@ local function tPrint(tbl, indent)
|
||||
end
|
||||
end
|
||||
|
||||
-- Debug event is server-only to prevent client spam
|
||||
RegisterServerEvent('QBCore:DebugSomething', function(tbl, indent, resource)
|
||||
-- Only allow server-side invocations (source 0 = server)
|
||||
if source and source > 0 then
|
||||
print(('[QBCore] ^1[SECURITY] Player %s (id: %d) tried to trigger debug event from client^0'):format(GetPlayerName(source) or 'Unknown', source))
|
||||
return
|
||||
end
|
||||
print(('\x1b[4m\x1b[36m[ %s : DEBUG]\x1b[0m'):format(resource))
|
||||
tPrint(tbl, indent)
|
||||
print('\x1b[4m\x1b[36m[ END DEBUG ]\x1b[0m')
|
||||
|
||||
@@ -7,9 +7,6 @@ AddEventHandler('chatMessage', function(_, _, message)
|
||||
end
|
||||
end)
|
||||
|
||||
-- Rate limit tracker for QBCore:UpdatePlayer
|
||||
local playerUpdateCooldowns = {}
|
||||
|
||||
AddEventHandler('playerDropped', function(reason)
|
||||
local src = source
|
||||
if not QBCore.Players[src] then return end
|
||||
@@ -19,8 +16,6 @@ AddEventHandler('playerDropped', function(reason)
|
||||
Player.Functions.Save()
|
||||
QBCore.Player_Buckets[Player.PlayerData.license] = nil
|
||||
QBCore.Players[src] = nil
|
||||
-- Clean up rate limit tracker
|
||||
if playerUpdateCooldowns then playerUpdateCooldowns[src] = nil end
|
||||
end)
|
||||
|
||||
-- Player Connecting
|
||||
@@ -37,145 +32,54 @@ if readyFunction ~= nil then
|
||||
if result and result[1] then
|
||||
bansTableExists = true
|
||||
end
|
||||
|
||||
-- Auto-migrate: add fivem column to bans table if missing
|
||||
local bansCols = MySQL.query.await(
|
||||
'SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = ? AND TABLE_NAME = "bans" AND COLUMN_NAME = "fivem"',
|
||||
{ DatabaseInfo.database }
|
||||
)
|
||||
if not bansCols or #bansCols == 0 then
|
||||
pcall(function()
|
||||
MySQL.query.await('ALTER TABLE bans ADD COLUMN fivem VARCHAR(255) DEFAULT NULL')
|
||||
MySQL.query.await('CREATE INDEX idx_bans_fivem ON bans(fivem)')
|
||||
print('[QBCore] ^2Added fivem column to bans table^0')
|
||||
end)
|
||||
end
|
||||
-- Ensure bans table has index on ip column
|
||||
pcall(function()
|
||||
local ipIdx = MySQL.query.await(
|
||||
'SELECT INDEX_NAME FROM INFORMATION_SCHEMA.STATISTICS WHERE TABLE_SCHEMA = ? AND TABLE_NAME = "bans" AND COLUMN_NAME = "ip"',
|
||||
{ DatabaseInfo.database }
|
||||
)
|
||||
if not ipIdx or #ipIdx == 0 then
|
||||
MySQL.query.await('CREATE INDEX idx_bans_ip ON bans(ip)')
|
||||
print('[QBCore] ^2Added ip index to bans table^0')
|
||||
end
|
||||
end)
|
||||
|
||||
-- Auto-migrate: add multi-identifier columns to players table if missing
|
||||
local columns = MySQL.query.await(
|
||||
'SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = ? AND TABLE_NAME = "players" AND COLUMN_NAME IN ("discord", "fivem")',
|
||||
{ DatabaseInfo.database }
|
||||
)
|
||||
local existingCols = {}
|
||||
if columns then
|
||||
for _, col in ipairs(columns) do
|
||||
existingCols[col.COLUMN_NAME] = true
|
||||
end
|
||||
end
|
||||
if not existingCols['discord'] then
|
||||
MySQL.query.await('ALTER TABLE players ADD COLUMN discord VARCHAR(255) DEFAULT NULL')
|
||||
MySQL.query.await('CREATE INDEX idx_players_discord ON players(discord)')
|
||||
print('[QBCore] ^2Added discord column to players table^0')
|
||||
end
|
||||
if not existingCols['fivem'] then
|
||||
MySQL.query.await('ALTER TABLE players ADD COLUMN fivem VARCHAR(255) DEFAULT NULL')
|
||||
MySQL.query.await('CREATE INDEX idx_players_fivem ON players(fivem)')
|
||||
print('[QBCore] ^2Added fivem column to players table^0')
|
||||
end
|
||||
print('[QBCore] ^2Multi-identifier system ready^0')
|
||||
end)
|
||||
end
|
||||
|
||||
local function onPlayerConnecting(name, setKickReason, deferrals)
|
||||
local function onPlayerConnecting(name, _, deferrals)
|
||||
local src = source
|
||||
deferrals.defer()
|
||||
Wait(0)
|
||||
|
||||
if QBCore.Config.Server.Closed and not IsPlayerAceAllowed(src, 'qbadmin.join') then
|
||||
deferrals.done(QBCore.Config.Server.ClosedReason or 'Server is currently closed')
|
||||
return
|
||||
return deferrals.done(QBCore.Config.Server.ClosedReason)
|
||||
end
|
||||
|
||||
if not databaseConnected then
|
||||
deferrals.done('Database is not connected. Please try again later.')
|
||||
return
|
||||
return deferrals.done(Lang:t('error.connecting_database_error'))
|
||||
end
|
||||
|
||||
if QBCore.Config.Server.Whitelist then
|
||||
Wait(0)
|
||||
deferrals.update(string.format(Lang:t('info.checking_whitelisted'), name))
|
||||
if not QBCore.Functions.IsWhitelisted(src) then
|
||||
deferrals.done(Lang:t('error.not_whitelisted'))
|
||||
return
|
||||
return deferrals.done(Lang:t('error.not_whitelisted'))
|
||||
end
|
||||
end
|
||||
|
||||
Wait(0)
|
||||
deferrals.update(string.format('Hello %s. Your license is being checked', name))
|
||||
local license = QBCore.Functions.GetIdentifier(src, 'license')
|
||||
|
||||
if not license then
|
||||
return deferrals.done(Lang:t('error.no_valid_license'))
|
||||
elseif QBCore.Config.Server.CheckDuplicateLicense and QBCore.Functions.IsLicenseInUse(license) then
|
||||
return deferrals.done(Lang:t('error.duplicate_license'))
|
||||
end
|
||||
|
||||
Wait(0)
|
||||
deferrals.update(string.format(Lang:t('info.checking_ban'), name))
|
||||
|
||||
local license = QBCore.Functions.GetIdentifier(src, 'license')
|
||||
|
||||
if not license then
|
||||
deferrals.done(Lang:t('error.no_valid_license'))
|
||||
return
|
||||
elseif QBCore.Config.Server.CheckDuplicateLicense and QBCore.Functions.IsLicenseInUse(license) then
|
||||
deferrals.done(Lang:t('error.duplicate_license'))
|
||||
return
|
||||
end
|
||||
|
||||
if not bansTableExists then
|
||||
deferrals.done('Ban system is not available. Please contact an admin.')
|
||||
return
|
||||
return deferrals.done(Lang:t('error.ban_table_not_found'))
|
||||
end
|
||||
|
||||
local success, isBanned, banReason = pcall(QBCore.Functions.IsPlayerBanned, src)
|
||||
if not success then
|
||||
deferrals.done('Error checking ban status. Please try again.')
|
||||
return
|
||||
end
|
||||
if isBanned then
|
||||
deferrals.done(banReason or 'You are banned from this server')
|
||||
return
|
||||
end
|
||||
|
||||
-- Multi-identifier migration (discord and fivem only)
|
||||
Wait(0)
|
||||
deferrals.update('Loading...')
|
||||
|
||||
local migrationSuccess, migrationError = pcall(function()
|
||||
local existingByLicense = MySQL.scalar.await('SELECT citizenid FROM players WHERE license = ? LIMIT 1', { license })
|
||||
if not existingByLicense then
|
||||
local discord = QBCore.Functions.GetIdentifier(src, 'discord')
|
||||
local fivem = QBCore.Functions.GetIdentifier(src, 'fivem')
|
||||
|
||||
local oldLicense = nil
|
||||
local matchedBy = nil
|
||||
|
||||
if discord then
|
||||
oldLicense = MySQL.scalar.await('SELECT license FROM players WHERE discord = ? LIMIT 1', { discord })
|
||||
if oldLicense then matchedBy = 'discord (' .. discord .. ')' end
|
||||
end
|
||||
if not oldLicense and fivem then
|
||||
oldLicense = MySQL.scalar.await('SELECT license FROM players WHERE fivem = ? LIMIT 1', { fivem })
|
||||
if oldLicense then matchedBy = 'fivem (' .. fivem .. ')' end
|
||||
end
|
||||
|
||||
if oldLicense and oldLicense ~= license then
|
||||
MySQL.update.await('UPDATE players SET license = ? WHERE license = ?', { license, oldLicense })
|
||||
MySQL.update.await('UPDATE player_vehicles SET license = ? WHERE license = ?', { license, oldLicense })
|
||||
MySQL.update.await('UPDATE bans SET license = ? WHERE license = ?', { license, oldLicense })
|
||||
print(('[QBCore] ^3[IDENTITY MIGRATION] %s matched by %s | old license: %s -> new license: %s^0'):format(name, matchedBy, oldLicense, license))
|
||||
end
|
||||
end
|
||||
end)
|
||||
|
||||
if not migrationSuccess then
|
||||
print(('[QBCore] ^1[IDENTITY MIGRATION ERROR] Failed for %s: %s^0'):format(name, migrationError))
|
||||
end
|
||||
local success, isBanned, reason = pcall(QBCore.Functions.IsPlayerBanned, src)
|
||||
if not success then return deferrals.done(Lang:t('error.connecting_database_error')) end
|
||||
if isBanned then return deferrals.done(reason) end
|
||||
|
||||
Wait(0)
|
||||
deferrals.update(string.format(Lang:t('info.join_server'), name))
|
||||
deferrals.done()
|
||||
|
||||
TriggerClientEvent('QBCore:Client:SharedUpdate', src, QBCore.Shared)
|
||||
end
|
||||
|
||||
@@ -210,22 +114,17 @@ end)
|
||||
|
||||
-- Callback Events --
|
||||
|
||||
-- Client Callback (source-validated to prevent spoofing)
|
||||
-- Client Callback
|
||||
RegisterNetEvent('QBCore:Server:TriggerClientCallback', function(name, ...)
|
||||
local src = source
|
||||
if not QBCore.ClientCallbacks[name] then return end
|
||||
-- Validate the callback was actually requested from this source
|
||||
if QBCore.ClientCallbacks[name].source and QBCore.ClientCallbacks[name].source ~= src then
|
||||
print(('[QBCore] ^1[SECURITY] Player %s (id: %d) tried to spoof client callback: %s^0'):format(GetPlayerName(src) or 'Unknown', src, name))
|
||||
return
|
||||
end
|
||||
QBCore.ClientCallbacks[name].promise:resolve(...)
|
||||
if QBCore.ClientCallbacks[name] then
|
||||
QBCore.ClientCallbacks[name].promise:resolve(...)
|
||||
|
||||
if QBCore.ClientCallbacks[name].callback then
|
||||
QBCore.ClientCallbacks[name].callback(...)
|
||||
end
|
||||
if QBCore.ClientCallbacks[name].callback then
|
||||
QBCore.ClientCallbacks[name].callback(...)
|
||||
end
|
||||
|
||||
QBCore.ClientCallbacks[name] = nil
|
||||
QBCore.ClientCallbacks[name] = nil
|
||||
end
|
||||
end)
|
||||
|
||||
-- Server Callback
|
||||
@@ -243,13 +142,6 @@ end)
|
||||
|
||||
RegisterNetEvent('QBCore:UpdatePlayer', function()
|
||||
local src = source
|
||||
-- Rate limit: max once per 30 seconds per player
|
||||
local now = GetGameTimer()
|
||||
if playerUpdateCooldowns[src] and (now - playerUpdateCooldowns[src]) < 30000 then
|
||||
return
|
||||
end
|
||||
playerUpdateCooldowns[src] = now
|
||||
|
||||
local Player = QBCore.Functions.GetPlayer(src)
|
||||
if not Player then return end
|
||||
local newHunger = Player.PlayerData.metadata['hunger'] - QBCore.Config.Player.HungerRate
|
||||
@@ -323,25 +215,6 @@ RegisterServerEvent('baseevents:leftVehicle', function(veh, seat, modelName)
|
||||
TriggerClientEvent('QBCore:Client:VehicleInfo', src, data)
|
||||
end)
|
||||
|
||||
-- Server-side autosave loop (independent of client events)
|
||||
CreateThread(function()
|
||||
local saveIntervalMs = (QBCore.Config.UpdateInterval or 5) * 60 * 1000
|
||||
while true do
|
||||
Wait(saveIntervalMs)
|
||||
local players = QBCore.Functions.GetPlayers()
|
||||
local count = 0
|
||||
for _, src in ipairs(players) do
|
||||
if QBCore.Players[src] then
|
||||
QBCore.Player.Save(src)
|
||||
count = count + 1
|
||||
end
|
||||
end
|
||||
if count > 0 then
|
||||
print(('[QBCore] ^2Server-side autosave complete: %d player(s) saved^0'):format(count))
|
||||
end
|
||||
end
|
||||
end)
|
||||
|
||||
-- Items
|
||||
|
||||
-- This event is exploitable and should not be used. It has been deprecated, and will be removed soon.
|
||||
|
||||
@@ -320,15 +320,14 @@ exports('GetCoreVersion', GetCoreVersion)
|
||||
|
||||
local function ExploitBan(playerId, origin)
|
||||
local name = GetPlayerName(playerId)
|
||||
MySQL.insert('INSERT INTO bans (name, license, discord, ip, reason, expire, bannedby, fivem) VALUES (?, ?, ?, ?, ?, ?, ?, ?)', {
|
||||
MySQL.insert('INSERT INTO bans (name, license, discord, ip, reason, expire, bannedby) VALUES (?, ?, ?, ?, ?, ?, ?)', {
|
||||
name,
|
||||
QBCore.Functions.GetIdentifier(playerId, 'license'),
|
||||
QBCore.Functions.GetIdentifier(playerId, 'discord'),
|
||||
QBCore.Functions.GetIdentifier(playerId, 'ip'),
|
||||
origin,
|
||||
2147483647,
|
||||
'Anti Cheat',
|
||||
QBCore.Functions.GetIdentifier(playerId, 'fivem')
|
||||
'Anti Cheat'
|
||||
})
|
||||
DropPlayer(playerId, Lang:t('info.exploit_banned', { discord = QBCore.Config.Server.Discord }))
|
||||
TriggerEvent('qb-log:server:CreateLog', 'anticheat', 'Anti-Cheat', 'red', name .. ' has been banned for exploiting ' .. origin, true)
|
||||
|
||||
@@ -394,6 +394,39 @@ function QBCore.Functions.CreateVehicle(source, model, vehtype, coords, warp)
|
||||
return veh
|
||||
end
|
||||
|
||||
function PaycheckInterval()
|
||||
if not next(QBCore.Players) then
|
||||
SetTimeout(QBCore.Config.Money.PayCheckTimeOut * (60 * 1000), PaycheckInterval) -- Prevent paychecks from stopping forever once 0 players
|
||||
return
|
||||
end
|
||||
for _, Player in pairs(QBCore.Players) do
|
||||
if not Player then return end
|
||||
local payment = QBShared.Jobs[Player.PlayerData.job.name]['grades'][tostring(Player.PlayerData.job.grade.level)].payment
|
||||
if not payment then payment = Player.PlayerData.job.payment end
|
||||
if Player.PlayerData.job and payment > 0 and (QBShared.Jobs[Player.PlayerData.job.name].offDutyPay or Player.PlayerData.job.onduty) then
|
||||
if QBCore.Config.Money.PayCheckSociety then
|
||||
local account = exports['qb-banking']:GetAccountBalance(Player.PlayerData.job.name)
|
||||
if account ~= 0 then
|
||||
if account < payment then
|
||||
TriggerClientEvent('QBCore:Notify', Player.PlayerData.source, Lang:t('error.company_too_poor'), 'error')
|
||||
else
|
||||
Player.Functions.AddMoney('bank', payment, 'paycheck')
|
||||
exports['qb-banking']:RemoveMoney(Player.PlayerData.job.name, payment, 'Employee Paycheck')
|
||||
TriggerClientEvent('QBCore:Notify', Player.PlayerData.source, Lang:t('info.received_paycheck', { value = payment }))
|
||||
end
|
||||
else
|
||||
Player.Functions.AddMoney('bank', payment, 'paycheck')
|
||||
TriggerClientEvent('QBCore:Notify', Player.PlayerData.source, Lang:t('info.received_paycheck', { value = payment }))
|
||||
end
|
||||
else
|
||||
Player.Functions.AddMoney('bank', payment, 'paycheck')
|
||||
TriggerClientEvent('QBCore:Notify', Player.PlayerData.source, Lang:t('info.received_paycheck', { value = payment }))
|
||||
end
|
||||
end
|
||||
end
|
||||
SetTimeout(QBCore.Config.Money.PayCheckTimeOut * (60 * 1000), PaycheckInterval)
|
||||
end
|
||||
|
||||
-- Callback Functions --
|
||||
|
||||
---Trigger Client Callback
|
||||
@@ -412,8 +445,7 @@ function QBCore.Functions.TriggerClientCallback(name, source, ...)
|
||||
|
||||
QBCore.ClientCallbacks[name] = {
|
||||
callback = cb,
|
||||
promise = promise.new(),
|
||||
source = source -- Track which player this callback is for
|
||||
promise = promise.new()
|
||||
}
|
||||
|
||||
TriggerClientEvent('QBCore:Client:TriggerClientCallback', source, name, table.unpack(args))
|
||||
@@ -440,10 +472,6 @@ function QBCore.Functions.CreateUseableItem(item, data)
|
||||
QBCore.UsableItems[item] = data
|
||||
end
|
||||
|
||||
-- Global alias for qs-inventory compatibility (calls CreateUsableItem as a global, not QBCore.Functions)
|
||||
QBCore.Functions.CreateUsableItem = QBCore.Functions.CreateUseableItem
|
||||
CreateUsableItem = QBCore.Functions.CreateUseableItem
|
||||
|
||||
---Checks if the given item is usable
|
||||
---@param item string
|
||||
---@return any
|
||||
@@ -586,40 +614,12 @@ function QBCore.Functions.ToggleOptin(source)
|
||||
Player.Functions.SetPlayerData('optin', Player.PlayerData.optin)
|
||||
end
|
||||
|
||||
---Check if player is banned (checks license, discord, ip, and fivem)
|
||||
---Check if player is banned
|
||||
---@param source any
|
||||
---@return boolean, string?
|
||||
function QBCore.Functions.IsPlayerBanned(source)
|
||||
local plicense = QBCore.Functions.GetIdentifier(source, 'license')
|
||||
local pdiscord = QBCore.Functions.GetIdentifier(source, 'discord')
|
||||
local pip = QBCore.Functions.GetIdentifier(source, 'ip')
|
||||
local pfivem = QBCore.Functions.GetIdentifier(source, 'fivem')
|
||||
|
||||
-- Build dynamic query to check ALL available identifiers
|
||||
local conditions = {}
|
||||
local params = {}
|
||||
if plicense then
|
||||
conditions[#conditions + 1] = 'license = ?'
|
||||
params[#params + 1] = plicense
|
||||
end
|
||||
if pdiscord then
|
||||
conditions[#conditions + 1] = 'discord = ?'
|
||||
params[#params + 1] = pdiscord
|
||||
end
|
||||
if pip then
|
||||
conditions[#conditions + 1] = 'ip = ?'
|
||||
params[#params + 1] = pip
|
||||
end
|
||||
if pfivem then
|
||||
conditions[#conditions + 1] = 'fivem = ?'
|
||||
params[#params + 1] = pfivem
|
||||
end
|
||||
|
||||
if #conditions == 0 then return false end
|
||||
|
||||
local query = 'SELECT id, reason, expire FROM bans WHERE (' .. table.concat(conditions, ' OR ') .. ') LIMIT 1'
|
||||
local result = MySQL.single.await(query, params)
|
||||
|
||||
local result = MySQL.single.await('SELECT id, reason, expire FROM bans WHERE license = ?', { plicense })
|
||||
if not result then return false end
|
||||
if os.time() < result.expire then
|
||||
local timeTable = os.date('*t', tonumber(result.expire))
|
||||
@@ -717,4 +717,4 @@ for functionName, func in pairs(QBCore.Functions) do
|
||||
end
|
||||
|
||||
-- Access a specific function directly:
|
||||
-- exports['qb-core']:Notify(source, 'Hello Player!')
|
||||
-- exports['qb-core']:Notify(source, 'Hello Player!')
|
||||
|
||||
@@ -97,8 +97,6 @@ function QBCore.Player.CheckPlayerData(source, PlayerData)
|
||||
if source then
|
||||
PlayerData.source = source
|
||||
PlayerData.license = PlayerData.license or QBCore.Functions.GetIdentifier(source, 'license')
|
||||
PlayerData.discord = QBCore.Functions.GetIdentifier(source, 'discord')
|
||||
PlayerData.fivem = QBCore.Functions.GetIdentifier(source, 'fivem')
|
||||
PlayerData.name = GetPlayerName(source)
|
||||
end
|
||||
|
||||
@@ -162,9 +160,6 @@ function QBCore.Player.Logout(source)
|
||||
TriggerEvent('QBCore:Server:OnPlayerUnload', source)
|
||||
TriggerClientEvent('QBCore:Player:UpdatePlayerData', source)
|
||||
Wait(200)
|
||||
if QBCore.Players[source] then
|
||||
QBCore.Players[source].Functions.Save()
|
||||
end
|
||||
QBCore.Players[source] = nil
|
||||
end
|
||||
|
||||
@@ -492,7 +487,7 @@ function QBCore.Player.Save(source)
|
||||
local pcoords = GetEntityCoords(ped)
|
||||
local PlayerData = QBCore.Players[source].PlayerData
|
||||
if PlayerData then
|
||||
MySQL.insert('INSERT INTO players (citizenid, cid, license, name, money, charinfo, job, gang, position, metadata, discord, fivem) VALUES (:citizenid, :cid, :license, :name, :money, :charinfo, :job, :gang, :position, :metadata, :discord, :fivem) ON DUPLICATE KEY UPDATE cid = :cid, name = :name, money = :money, charinfo = :charinfo, job = :job, gang = :gang, position = :position, metadata = :metadata, discord = :discord, fivem = :fivem', {
|
||||
MySQL.insert('INSERT INTO players (citizenid, cid, license, name, money, charinfo, job, gang, position, metadata) VALUES (:citizenid, :cid, :license, :name, :money, :charinfo, :job, :gang, :position, :metadata) ON DUPLICATE KEY UPDATE cid = :cid, name = :name, money = :money, charinfo = :charinfo, job = :job, gang = :gang, position = :position, metadata = :metadata', {
|
||||
citizenid = PlayerData.citizenid,
|
||||
cid = tonumber(PlayerData.cid),
|
||||
license = PlayerData.license,
|
||||
@@ -502,9 +497,7 @@ function QBCore.Player.Save(source)
|
||||
job = json.encode(PlayerData.job),
|
||||
gang = json.encode(PlayerData.gang),
|
||||
position = json.encode(pcoords),
|
||||
metadata = json.encode(PlayerData.metadata),
|
||||
discord = PlayerData.discord,
|
||||
fivem = PlayerData.fivem
|
||||
metadata = json.encode(PlayerData.metadata)
|
||||
})
|
||||
if GetResourceState('qs-inventory') ~= 'missing' then exports['qs-inventory']:SaveInventory(source) end
|
||||
QBCore.ShowSuccess(resourceName, PlayerData.name .. ' PLAYER SAVED!')
|
||||
@@ -524,7 +517,7 @@ end)
|
||||
|
||||
function QBCore.Player.SaveOffline(PlayerData)
|
||||
if PlayerData then
|
||||
MySQL.insert('INSERT INTO players (citizenid, cid, license, name, money, charinfo, job, gang, position, metadata, discord, fivem) VALUES (:citizenid, :cid, :license, :name, :money, :charinfo, :job, :gang, :position, :metadata, :discord, :fivem) ON DUPLICATE KEY UPDATE cid = :cid, name = :name, money = :money, charinfo = :charinfo, job = :job, gang = :gang, position = :position, metadata = :metadata, discord = :discord, fivem = :fivem', {
|
||||
MySQL.insert('INSERT INTO players (citizenid, cid, license, name, money, charinfo, job, gang, position, metadata) VALUES (:citizenid, :cid, :license, :name, :money, :charinfo, :job, :gang, :position, :metadata) ON DUPLICATE KEY UPDATE cid = :cid, name = :name, money = :money, charinfo = :charinfo, job = :job, gang = :gang, position = :position, metadata = :metadata', {
|
||||
citizenid = PlayerData.citizenid,
|
||||
cid = tonumber(PlayerData.cid),
|
||||
license = PlayerData.license,
|
||||
@@ -534,9 +527,7 @@ function QBCore.Player.SaveOffline(PlayerData)
|
||||
job = json.encode(PlayerData.job),
|
||||
gang = json.encode(PlayerData.gang),
|
||||
position = json.encode(PlayerData.position),
|
||||
metadata = json.encode(PlayerData.metadata),
|
||||
discord = PlayerData.discord,
|
||||
fivem = PlayerData.fivem
|
||||
metadata = json.encode(PlayerData.metadata)
|
||||
})
|
||||
if GetResourceState('qs-inventory') ~= 'missing' then exports['qs-inventory']:SaveInventory(PlayerData, true) end
|
||||
QBCore.ShowSuccess(resourceName, PlayerData.name .. ' OFFLINE PLAYER SAVED!')
|
||||
@@ -549,34 +540,23 @@ end
|
||||
|
||||
local playertables = { -- Add tables as needed
|
||||
{ table = 'players' },
|
||||
-- { table = 'apartments' }, -- removed: 17mov replaces qb-apartments, table doesn't exist
|
||||
-- { table = 'bank_accounts' }, -- may not exist
|
||||
-- { table = 'crypto_transactions' }, -- may not exist
|
||||
-- { table = 'phone_invoices' }, -- qs-smartphone uses different schema
|
||||
-- { table = 'phone_messages' }, -- qs-smartphone uses different schema (no citizenid column)
|
||||
-- { table = 'apartments' }, -- REMOVED: tabelul nu există (qs-housing folosește houselocations)
|
||||
{ table = 'bank_accounts' },
|
||||
{ table = 'crypto_transactions' },
|
||||
{ table = 'phone_invoices' },
|
||||
-- { table = 'phone_messages' }, -- REMOVED: coloana citizenid nu există în acest tabel (qs-smartphone-pro)
|
||||
{ table = 'playerskins' },
|
||||
-- { table = 'player_contacts' }, -- qs-smartphone uses different schema
|
||||
-- { table = 'player_houses' }, -- may not exist (qs-housing has own schema)
|
||||
-- { table = 'player_mails' }, -- may not exist
|
||||
-- { table = 'player_contacts' }, -- REMOVED: qs-smartphone-pro nu are coloana citizenid
|
||||
{ table = 'player_houses' },
|
||||
-- { table = 'player_mails' }, -- REMOVED: qs-smartphone-pro nu are coloana citizenid
|
||||
{ table = 'player_outfits' },
|
||||
{ table = 'player_vehicles' }
|
||||
}
|
||||
|
||||
function QBCore.Player.DeleteCharacter(source, citizenid)
|
||||
local license = QBCore.Functions.GetIdentifier(source, 'license')
|
||||
local result = MySQL.single.await('SELECT license, discord, fivem FROM players WHERE citizenid = ?', { citizenid })
|
||||
if not result then
|
||||
DropPlayer(source, Lang:t('info.exploit_dropped'))
|
||||
TriggerEvent('qb-log:server:CreateLog', 'anticheat', 'Anti-Cheat', 'white', GetPlayerName(source) .. ' Has Been Dropped For Character Deletion Exploit', true)
|
||||
return
|
||||
end
|
||||
-- Allow deletion if ANY identifier matches (not just license)
|
||||
local discord = QBCore.Functions.GetIdentifier(source, 'discord')
|
||||
local fivem = QBCore.Functions.GetIdentifier(source, 'fivem')
|
||||
local isOwner = (license == result.license)
|
||||
or (discord and result.discord and discord == result.discord)
|
||||
or (fivem and result.fivem and fivem == result.fivem)
|
||||
if isOwner then
|
||||
local result = MySQL.scalar.await('SELECT license FROM players where citizenid = ?', { citizenid })
|
||||
if license == result then
|
||||
local query = 'DELETE FROM %s WHERE citizenid = ?'
|
||||
local tableCount = #playertables
|
||||
local queries = table.create(tableCount, 0)
|
||||
@@ -690,4 +670,6 @@ function QBCore.Player.CreateSerialNumber()
|
||||
local result = MySQL.prepare.await('SELECT EXISTS(SELECT 1 FROM players WHERE JSON_UNQUOTE(JSON_EXTRACT(metadata, "$.phonedata.SerialNumber")) = ?) AS uniqueCheck', { SerialNumber })
|
||||
if result == 0 then return SerialNumber end
|
||||
return QBCore.Player.CreateSerialNumber()
|
||||
end
|
||||
end
|
||||
|
||||
PaycheckInterval() -- This starts the paycheck system
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -5,10 +5,9 @@ local NumberCharset = {}
|
||||
|
||||
QBShared.StarterItems = {
|
||||
['phone'] = { amount = 1, item = 'phone' },
|
||||
['map'] = { amount = 1, item = 'map' },
|
||||
-- id_card: se primește la mugshot (0r_idcard) nu la spawn
|
||||
-- * TODO: spawn_mask — item custom cu script usable care aplică masca specifică (134/2 male, 134/3 female)
|
||||
-- ['spawn_mask'] = { amount = 1, item = 'spawn_mask' },
|
||||
['map'] = { amount = 1, item = 'map' }, -- RED VALLEY: harta pentru rv-maphold
|
||||
-- ['id_card'] = { amount = 1, item = 'id_card' }, -- RED VALLEY: se ia de la mugshot
|
||||
-- ['driver_license'] = { amount = 1, item = 'driver_license' }, -- RED VALLEY: se ia de la scoala de soferi
|
||||
}
|
||||
|
||||
for i = 48, 57 do NumberCharset[#NumberCharset + 1] = string.char(i) end
|
||||
|
||||
Reference in New Issue
Block a user