Commit Graph

339 Commits

Author SHA1 Message Date
Kakarot 414f946688 Merge branch 'main' into main 2023-04-27 15:46:47 -07:00
erikmeyer08 822b2e4187 Add pacycheck reason
Adds the string 'paycheck' for AddMoney function 'reason' variable.
2023-04-14 20:06:09 -04:00
tom-osborne 5feec5582b correct use of "or nil" 2023-03-02 07:28:25 +00:00
tom-osborne 7620c1c74a Add documentation (luadoc) to functions 2023-03-01 23:47:21 +00:00
R0adRa93 01e8597f07 [FIX] Security match sql (#925)
* Added PrepForSQL function

performs a check to a string with expected patterns to be matched.

* Bug Fixes

After talking with Stan I realized that it wasn't testing strings so I set it up to ensure data is a string.

I also reworded the event log.
2023-01-18 18:53:38 +01:00
R0adRa93 9878aeaeb2 Added PrepForSQL function (#914)
performs a check to a string with expected patterns to be matched.
2023-01-17 16:01:36 +01:00
Zerio 8d5a0800ab Merge branch 'main' into main 2022-12-20 18:56:38 +01:00
KamuiKody c79a7b907a add baseevents back (#898) 2022-12-19 22:29:18 +01:00
Zerio 95de86d2e1 Merge branch 'qbcore-framework:main' into main 2022-12-17 01:18:57 +01:00
Zerio b057ef0395 Remove deprecated events 2022-12-17 01:18:16 +01:00
Zerio 091bcd2c3e Remove unnused & vulnerable event 2022-12-17 01:17:02 +01:00
R0adRa93 cc64ee38e8 Getting QB-Core ready for qb-jobs (#883)
Co-authored-by: Zerio <54480523+Z3rio@users.noreply.github.com>
2022-12-16 23:38:31 +01:00
Chris Sinclair 312f24d245 Bypass for loading QBCore in FxDK (#792)
FxDK does not include license identifiers by default and thus breaks scripts that utilize those. Without this you will get the "No valid Rockstar license" error when connecting. This fix was not my own I found it in the post linked below and tested myself.

https://forum.cfx.re/t/connection-rejected-by-server-fxdk/2504365/5

Co-authored-by: Kakarot <57848836+GhzGarage@users.noreply.github.com>
Co-authored-by: Stan <96954031+tom-osborne@users.noreply.github.com>
Co-authored-by: Zerio <54480523+Z3rio@users.noreply.github.com>
2022-12-11 13:43:10 +01:00
KamuiKody 5635ffbf04 Merge branch 'qbcore-framework:main' into main 2022-10-14 02:01:07 +00:00
David Malchin bd30889c1c Improve comments 2022-10-08 03:53:25 +03:00
David Malchin fd86efbe1b Raise server-side error on database timeout 2022-10-08 03:52:59 +03:00
David Malchin 67ef3741b7 Add clearer messages and handle database errors on player connecting 2022-09-30 02:06:04 +03:00
KamuiKody 6d48fbf850 Merge branch 'qbcore-framework:main' into main 2022-09-09 00:48:31 -04:00
Anton Stjernquist 7aefc17c2b feat: send reason with event 2022-09-07 22:43:58 +02:00
KamuiKody 8386143cd7 Framework Optimization
for optimization of other resources.
2022-09-04 22:51:27 -04:00
Linden bc7555a49c refactor(server/functions): grant principal to player.id
Easier to read and test aces.
2022-09-01 07:32:00 +10:00
Linden 1cd8503ee1 fix(server/player): don't refresh commands when updating PlayerData 2022-09-01 07:31:54 +10:00
Zerio ad703290fd Update server/player.lua
Co-authored-by: David Malchin <malchin459@gmail.com>
2022-08-29 21:05:20 +02:00
Zerio 6b5ddc2c61 Add force deletion of characters 2022-08-27 16:38:07 +02:00
Kakarot a734211478 Update events.lua 2022-08-26 09:23:41 -05:00
Kakarot 156182dd93 Update events.lua 2022-08-26 08:49:22 -05:00
BerkieBb 8557e599f0 tweak(server/functions): usableitems are back in the core 2022-08-25 17:42:55 +02:00
BerkieBb 7e52fbe937 chore(server/main): move QBCore.UseableItems 2022-08-25 17:42:20 +02:00
Kakarot 97e123633b Merge branch 'main' into main 2022-08-25 07:50:45 -07:00
BerkieBb d563a89891 fix(server/player): add forgotten variable for setmoney 2022-08-24 15:06:40 +02:00
BerkieBb 59ae47fa92 feat(server/player): hud update on SetMoney 2022-08-24 15:05:12 +02:00
Spudgun c61d0b204e tweak: HasPermissions accept both string and table
Enables single and multiple permission checks
2022-08-24 18:57:53 +12:00
Kakarot e01399f799 Merge pull request #804 from BerkieBb/main
fix(server/player): cap for thirst and hunger
2022-08-21 18:44:27 -07:00
David Malchin 6513c55aa5 🎨 Use tables in command locales 2022-08-22 03:46:52 +03:00
BerkieBb 4412ef29ca fix(server/player): cap for thirst and hunger 2022-08-22 01:32:51 +02:00
David Malchin ce216ad676 🎨 Rename locales and remove notify translation type 2022-08-21 23:48:45 +03:00
ChatDisabled a1d80b8481 server/player.lua 2022-08-21 18:37:45 +02:00
ChatDisabled 7aba11da2c server/exports.lua 2022-08-21 18:36:50 +02:00
ChatDisabled 6ee58f9017 server/events.lua 2022-08-21 18:34:22 +02:00
ChatDisabled 13f88bf2e8 server/commands.lua + remove dubble locales 2022-08-21 18:33:15 +02:00
ChatDisabled 89f1bc0440 Sigh 2022-08-20 23:52:25 +02:00
Kakarot 9afbc18135 Merge pull request #800 from BerkieBb/money-change-listener
feat(server/player): money change listeners
2022-08-20 14:11:54 -07:00
BerkieBb 3bb0547548 feat(server/player): money change listeners 2022-08-20 13:39:14 +02:00
BerkieBb 6231dbab6a feat(server/functions): usable item exports 2022-08-20 09:36:08 +02:00
Kakarot 8fffc421bb Merge Dev (#794)
* [Update] Stuff and Things - Fix Exploit

- Update doors on teleport so they don't get stuck (requires my doorlock PR that creates a updateDoors() export
- Support for heading with TeleportToCoords event
- Support for teleporting to location name with /tp and a default file with locations to use
- Remove 'QBCore:Server:AddItem' event (requires PR to other resources that use it)
- Support for an array of items that do the same thing with QBCore.Functions.CreateUsableItem
- Player exists check before removing or adding permission
- Trigger OnPlayerUnload as a server side event too
- Player.Functions.GetMetaData function
- Added reason to money remove logs
- Set dirt level to 0 on /car vehicles

* Export to Event

* Deprecate instead of remove?

* Player+License verification fix

* Update events.lua

* Export change for qb-management

* [Hotfix] Errors after Merge

* [Change] src to source

* Prevent people using /me to troll

This prevents people using that /me troll with the huge font size and different colors.

* Remove DoorUpdate event

* Update client/events.lua

Co-authored-by: BerkieBb <82737367+BerkieBb@users.noreply.github.com>

* Update server/functions.lua

Co-authored-by: BerkieBb <82737367+BerkieBb@users.noreply.github.com>

* Adjustments for BB

* Linting

* fix(server/functions): use indexed variables

Co-authored-by: David Malchin <malchin459@gmail.com>

* chore(server/events): remove unnecessary _

Co-authored-by: David Malchin <malchin459@gmail.com>

* chore(server/events): remove unnecessary _'s

Co-authored-by: David Malchin <malchin459@gmail.com>

* chore(server/events): language

Co-authored-by: David Malchin <malchin459@gmail.com>

* chore(server/events): language

Co-authored-by: David Malchin <malchin459@gmail.com>

* chore(server/events): language

Co-authored-by: David Malchin <malchin459@gmail.com>

* chore(server/events): language

Co-authored-by: David Malchin <malchin459@gmail.com>

* chore(server/player): indentation

Co-authored-by: David Malchin <malchin459@gmail.com>

* [Chore] Remove Money

Removed repetitive code that made zero sense

* Update en.lua

* Update player.lua

* Update player.lua

* Update functions.lua

Co-authored-by: ItsANoBrainer <itsanobrainergg@protonmail.com>
Co-authored-by: Scullyy <51968381+Scullyy@users.noreply.github.com>
Co-authored-by: Idris Dev <IdrisDose@users.noreply.github.com>
Co-authored-by: Idris <idrisdev@gmail.com>
Co-authored-by: BerkieBb <82737367+BerkieBb@users.noreply.github.com>
Co-authored-by: David Malchin <malchin459@gmail.com>
Co-authored-by: Chris Usiak <christopher.usiak@oakland.k12.mi.us>
2022-08-19 11:48:39 -05:00
BerkieBb d88e51ee4f Remove inventory code from the core (#784)
* tweak(config): remove inventory code

* tweak(client/functions): remove inventory code

* cleanup(server/commands): remove inventory command

* cleanup(server/events): remove hasitem callback

* cleanup(server/functions): remove inventory code

* cleanup(server/player): remove inventory code

* feat(server/player): QBCore:Player:SetPlayerData server side

Removed QBCore:Server:PlayerLoaded for PR that will be merged before me that adds it

* feat(server/player): QBCore:Server:OnGangUpdate

* fix(shared/items): remove duplicate snowball

* fix(server/events): warn for exploitable event

* fix(server/functions): startup error

* feat(server/player): some backwards compatibility

* fix(server/events): warn for exploitable event

* feat(server/player): Player.Functions.AddField

* feat(server/exports): SetField and AddField

* fix(server/player): inventory state check
2022-08-19 11:33:38 -05:00
Gürkan 0e07fea92d update player.lua - To fix number check
"GetPlayerByPhone" fixes some players' phone number not matching
2022-08-18 03:10:04 +03:00
Ethan Johnson 15e37a0c34 Performance, notification, and localization updates to server/commands.lua (#638)
* 🐎 Update ace permissions loop from pairs() to for-i

* Add success notification to `openserver` and `closeserver`

* 🌐 Add missing localization strings for commands

* Add missing comma at end of line

Co-authored-by: Kakarot <57848836+GhzGarage@users.noreply.github.com>
Co-authored-by: BerkieBb <82737367+BerkieBb@users.noreply.github.com>
2022-08-15 08:37:32 +02:00
BerkieBb c52e501588 fix(server/player): wrong type 2022-08-10 17:37:29 +02:00
BerkieBb b1e1c11788 fix(server/player): example 2022-08-10 16:14:10 +02:00