Commit Graph

155 Commits

Author SHA1 Message Date
Scullyy ca5383f2d2 Prevent duplicated phone and account numbers
Describe Pull request
This will prevent the chance of duplicated phone and account numbers, although the chance is very low it's still a possibility as I have experienced this myself and this will resolve that issue. I feel like this should be implemented as these are meant to be unique for each player.

Questions:
- Have you personally loaded this code into an updated qbcore project and checked all it's functionality? Yes
- Does your code fit the style guidelines? Yes
- Does your PR fit the contribution guidelines? Yes
2022-02-03 13:48:40 +00:00
Scullyy 6379245963 Revert "Prevent duplicated phone and account numbers"
This reverts commit 8ca8282f2a.
2022-02-03 13:44:56 +00:00
Scullyy 8ca8282f2a Prevent duplicated phone and account numbers
**Describe Pull request**
This will prevent the chance of duplicated phone and account numbers, although the chance is very low it's still a possibility as I have experienced this myself and this will resolve that issue. I feel like this should be implemented as these are meant to be unique for each player.

**Questions (please complete the following information):**
- Have you personally loaded this code into an updated qbcore project and checked all it's functionality? Yes
- Does your code fit the style guidelines? Yes
- Does your PR fit the contribution guidelines? Yes
2022-02-03 13:31:48 +00:00
Pierre Grassin 89036ac470 Update player.lua 2022-01-10 18:57:13 +01:00
Kakarot d786a3cd07 Locale/oxmysql
MUST UPDATE OXMYSQL TO 1.9 OR HIGHER
2022-01-10 01:52:59 -06:00
BerkieBb 632edc96c2 chore(paychecks): Add back removed code 2022-01-07 03:03:23 +01:00
BerkieBb 5d9e52ce55 fix(paychecks): Get account the right way 2022-01-07 02:59:42 +01:00
Kakarot bca9ebe664 Merge pull request #414 from Brady-F/main
Add paychecks from society account
2022-01-06 19:49:09 -06:00
Kakarot 0b2e61be7e Merge pull request #399 from Yianss/patch-1
Update the way jobrep metadata is handled
2022-01-05 11:48:13 -06:00
uShifty ae64a9ed02 Fix(RemoveItem): Exploit Remove Item
This issues fixes the possible exploit when removing an item when sending the item slot parameter before you were able to send any amount of an item and it would return as if the remove item worked just fine returning true
2022-01-01 22:23:12 -08:00
Kakarot 71e4d7b8ff Revert weird shit 2022-01-01 21:32:37 -06:00
bmf1418 9a251cd160 Add paychecks from society account
Added config option for paychecks to be taken from society account when the player is employed by a society.
2022-01-01 15:18:32 -06:00
Ollie Pugh 8ef28d2d05 Added support for placing items on ground if inv too full 2021-12-30 02:56:30 +00:00
Yianss 1b3225d8f6 Update the way jobrep metadata is handled
When you add a new job, existing players cannot get jobrep for it because the original jobrep metadata is always loaded instead. With this method, existing players can get jobrep for new jobs.

This checks to make sure that jobrep metadata isn't nil so that new players do not get stuck in an infinite loop, and instead creates new jobrep metadata for them.

There may be a better way to do this, but this works.
2021-12-27 02:49:34 -05:00
Stable ba67673b07 Fix Nil player_buckets if player leave 2021-12-20 15:48:17 +07:00
Kakarot 876def5ca5 Merge pull request #375 from GameMango36/main
feat(paychecks): Jobs Off Duty Payment Option
2021-12-19 20:07:40 -06:00
Kakarot 54300267a0 Merge pull request #358 from Mitroxs/main
Introduction to Routingbuckets
2021-12-19 20:04:34 -06:00
MiddleSkillz d56bdd2b98 feat(paychecks): Jobs Off Duty Payment Option 2021-12-16 19:52:00 -07:00
Jagen0 cebd4e5e47 Unused TriggerClientEvent 2021-12-05 12:31:40 +03:00
Mitroxs 88820c80f1 typo ⁉️ 2021-12-03 22:09:28 +01:00
Mitroxs a3a763c86a Get function for the bucket objects 2021-12-03 19:06:40 +01:00
Mitroxs 6d553436ec Merge branch 'main' of https://github.com/Mitroxs/qb-core 2021-12-03 18:25:10 +01:00
Mitroxs 315f70600d Deattach from QBcore object 2021-12-03 18:25:00 +01:00
Mitroxs 0c55486312 Update server/functions.lua
Co-authored-by: Taso <taso@projecterror.dev>
2021-12-03 18:18:14 +01:00
Mitroxs b9712a0fe5 Introduction to Routingbuckets 2021-12-03 17:35:32 +01:00
Mitroxs 6ee16d2262 Introduces PvP toggle: ft command 2021-12-02 23:02:30 +01:00
jnccloud 649420b82f Index is incorrect when players disconnect
It causes the index count to be skewed, and in turn causes an error in the thread and it never runs again until restart. Using the pairs alleviated this in a test environment.
2021-11-29 12:43:22 -05:00
Kakarot d8bf3cb9c8 Merge branch 'main' of https://github.com/qbcore-framework/qb-core 2021-11-28 15:54:42 -06:00
Kakarot e0bbb72b6f Should fix paycheck problems 2021-11-28 15:54:15 -06:00
Jack 7c3d1bc973 Fix security issue 2021-11-28 17:10:27 +00:00
Jamie b921b70989 Update commands.lua
Fixed the bug with /me
2021-11-27 00:28:56 +00:00
jay-fivem 7faad000ba Removed useless string 2021-11-17 21:12:50 +10:30
vanillaa ee9a922684 Update player.lua 2021-11-14 12:54:11 +02:00
Braydxn 47caa1a563 FIX 2021-11-13 19:51:04 -05:00
Mojito-Fivem b3346527be refactor(paycheckloop): Localise payment and format string 2021-11-08 17:37:33 +00:00
Mojito-Fivem aac822402d fix(refactor/paycheckloop): Send to players source 2021-11-08 17:36:11 +00:00
Mojito-Fivem 3d47bd8589 refacotr(server/functions): Optimise PaycheckLoop function 2021-11-08 17:27:14 +00:00
Mojito-Fivem 21d85a63ec chore(server/functions): Add Comments for GetDuty functions 2021-11-07 22:47:39 +00:00
Mojito-Fivem 85819bddbf feat(server/functions): GetDutyCount 2021-11-07 22:46:00 +00:00
Mojito-Fivem 2236163d5c feat(server/functions): GetPlayersOnDuty
Co-authored-by: Solositeous <36283056+Solositeous@users.noreply.github.com>
2021-11-07 22:44:39 +00:00
Kakarot 9a1f1ab565 Remove table.insert 2021-11-02 23:16:52 -06:00
Kakarot 07e110920f Inventory singleSync 2021-11-01 15:24:21 -06:00
BerkieBb e6f423fa04 feat(core/ooc): Rename to Proximity OOC to prevent confusion and double OOC messages for admins and gods 2021-11-01 09:53:46 +01:00
Kakarot 8a19f0163d Fix /ooc & add /me 2021-11-01 00:44:38 -06:00
Mojito-Fivem 9fd5e75302 refactor(maths): move maths function to shared.lua 2021-10-31 21:38:45 +00:00
Kakarot 005e311df1 Update functions.lua 2021-10-31 09:47:29 -05:00
Kakarot 0b83012b54 Merge pull request #246 from IdrisDose/main
feat (Functions/Math): Added Precision Rounding so that people can round to nearest decimal efficiently.
2021-10-31 07:50:27 -06:00
Kakarot 2c20ffba03 Merge pull request #274 from LV-Soft/main
Fix always "on duty" at login.
2021-10-30 17:07:05 -06:00
AJ a8c7317970 feat(server): Only get paid while on Duty 2021-10-28 04:10:21 -04:00
Kakarot 570129bfd3 chore(oxmysql): Replace fetch 2021-10-24 11:18:52 -06:00