Commit Graph

251 Commits

Author SHA1 Message Date
Kakarot 1b795179b7 Merge branch 'main' into patch-1 2022-06-15 18:07:59 -07:00
Kakarot 53190a87ab Merge branch 'main' into main 2022-06-15 18:00:39 -07:00
Kakarot b43f9cecc9 Merge branch 'main' into patch-1 2022-06-15 17:51:02 -07:00
Kakarot 8cb6c676a6 Merge pull request #718 from uShifty/patch-4
fix: Phone number generation
2022-06-15 17:48:43 -07:00
Kakarot 9d3506f5d0 Merge branch 'main' into main 2022-06-15 17:32:51 -07:00
Kakarot 794020274e Merge branch 'main' into patch-2 2022-06-15 17:29:51 -07:00
Kakarot 3808b8dc0d Merge branch 'main' into patch-1 2022-06-15 17:29:47 -07:00
Kakarot 92eab1feb3 Merge branch 'main' into patch-4 2022-06-15 17:29:18 -07:00
Kakarot e8dd5941f4 Prevent error 2022-06-15 15:03:06 -07:00
Lionh34rt 8062549f1b fix(server): linting issues 2022-06-08 17:26:49 +02:00
uShifty 88d31270bf fix: Phone number generation
Due to merging the 2 sets of random generated numbers it makes the variable PhoneNumber a string when it should be a number value. I noticed this bug when the framework function QBCore.Functions.GetPlayerByPhone was not working as intended.
2022-06-06 20:05:24 -07:00
QBLes 3c7f28f0b4 Updated to Events.lua
To allow backwards compatibility, this update Broke many scripts.
2022-06-06 17:49:25 +10:00
Lionh34rt bc95a864b9 ExploitBan export
This export allows you to use it any script for exploit checks. Instead of having to define the function in multiple scripts like:

exports['qb-core']:ExploitBan(source, "pawn-shop")

https://github.com/qbcore-framework/qb-pawnshop/commit/8e81307cbabc3607fe4a82f88abf13765b35cf2f
2022-06-06 03:34:48 +02:00
BerkieBb af3a564abd fix(server/events): QBCore:HasItem callback
Fixed the wrong return value of the check when a table is passed and added back the string indexed table amount check
2022-05-19 17:13:37 +02:00
Kakarot fbdf566649 MySQL Updates 2022-05-19 00:52:22 -05:00
Idris Dev eeafbd0405 fix: removed extra space in concatentation. 2022-05-19 09:53:16 +10:00
Tom Osborne 99d78988dc Merge branch 'main' into patch-1 2022-05-18 19:44:56 +01:00
TheiLLeniumStudios e484ea0d48 Improve logic for HasItem 2022-05-13 06:16:21 +00:00
Tom Osborne 34c1988a9b Added 'reason' to playerDropped log
Added the reason given by the playerDropped event to the qb-logs discord embed message. Formatted on next line.
2022-05-12 19:18:31 +01:00
almez bdd95c074f Update exports.lua 2022-05-10 21:00:17 +03:00
TheiLLeniumStudios c2807c8b37 Clean up logic for HasItem to fix the linting warning 2022-05-06 15:42:27 +00:00
TheiLLeniumStudios fe9dae0543 Change back to compound operators 2022-05-06 13:56:21 +00:00
TheiLLeniumStudios db11c7dcec Fix linting issues 2022-05-04 08:08:29 +00:00
Joel ad57a480b3 fix(clearinv): Player id definition
Fixes playerid from becoming "true" instead of the ID or source
2022-04-23 21:35:09 +01:00
Lionh34rt 43b107fd4c Update server/player.lua
Co-authored-by: ItsANoBrainer <itsanobrainergg@protonmail.com>
2022-04-22 22:24:15 +02:00
Lionh34rt 56473b4843 Update server/player.lua
Co-authored-by: ItsANoBrainer <itsanobrainergg@protonmail.com>
2022-04-22 22:24:11 +02:00
Tony 9d1ebbad16 forgor the string.format 2022-04-13 23:12:19 +02:00
Matas 8ec1eb4b32 Remove unneeded bracket 2022-04-13 14:59:44 +02:00
Kakarot 58b6762ab6 Merge pull request #579 from TonybynMp4/TonybynMp4-Translations
Add Joining Server Translations
2022-04-13 05:31:20 -07:00
Ethan 75a762f3e8 /me command - Use regex to replace formatting text
Uses regex to replace strings that match `<*>` and `~*~` in the `/me` command.
Regex: https://regex101.com/r/rrNMnx/1
2022-04-13 19:23:45 +12:00
Ethan d5280f32f2 🐎 /me command - Convert pairs() loop to for loop
As per test 9 @ https://springrts.com/wiki/Lua_Performance#TEST_9:_for-loops
2022-04-13 19:06:59 +12:00
Ethan c21cde06f7 🐎 /me command - Check input first 2022-04-13 19:02:18 +12:00
Ethan Johnson 3d4343d420 Add support for commas and integers in the TP command 2022-04-12 23:16:54 +12:00
Kakarot 62dd12a4d9 Update callcommand permission check 2022-04-10 23:00:42 -05:00
LwkyLion 04994137c1 Update player.lua
Deleting character causes an issue because the table "player_boats" was still trying to be deleted and no such table existed.
2022-04-08 11:20:40 -07:00
Idris Dev de249c0439 feat: Added ChatEvent handler to server/events.lua
Merge pull request #613 from qbcore-framework/feat/HideBrokenCommands
2022-04-05 14:03:03 +10:00
Idris 429966cdd7 chore: removed bloated chatMessage code. 2022-04-05 13:57:16 +10:00
Lionh34rt 1c0e73d6d9 PlayerData.job.isleo 2022-04-04 14:23:43 +02:00
Kakarot 3f703a2950 Event to export 2022-04-02 16:01:06 -05:00
Idris aab215334f feat: Added ChatEvent handler to server/events.lua 2022-04-02 18:51:47 +11:00
Kakarot cddbd0184c Accidental s 2022-03-30 23:02:44 -05:00
Kakarot cf0de3ed35 Merge pull request #594 from GhzGarage/main
WIP Permissions System
2022-03-30 16:31:36 -06:00
Kakarot ccbc6b216d Remove job check 2022-03-30 17:25:20 -05:00
Kakarot b04eb3f43a Update to qbcore. 2022-03-30 17:05:07 -05:00
Kakarot 2d6159345b Remove 2022-03-30 01:31:36 -05:00
Kakarot eb34e65204 More changes 2022-03-30 01:20:11 -05:00
Kakarot dd6c6c4a09 More changes 2022-03-30 01:04:59 -05:00
Kakarot 46a2aae5ce More changes 2022-03-30 00:45:31 -05:00
Kakarot f5e22066fb More changes 2022-03-29 22:33:26 -05:00
Kakarot a528a0b127 More updates 2022-03-29 22:12:00 -05:00