mirror of
https://github.com/qbcore-fivem/qb-core.git
synced 2026-08-29 05:02:24 +00:00
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>
This commit is contained in:
+6
-8
@@ -173,18 +173,16 @@ RegisterNetEvent('QBCore:Server:UseItem', function(item)
|
||||
QBCore.Debug(item)
|
||||
end)
|
||||
|
||||
RegisterNetEvent('QBCore:Server:RemoveItem', function(itemName, amount, slot)
|
||||
-- This event is exploitable and should not be used. It has been deprecated, and will be removed soon. function(itemName, amount, slot)
|
||||
RegisterNetEvent('QBCore:Server:RemoveItem', function(itemName, amount)
|
||||
local src = source
|
||||
local Player = QBCore.Functions.GetPlayer(src)
|
||||
if not Player then return end
|
||||
Player.Functions.RemoveItem(itemName, amount, slot)
|
||||
print(string.format("%s triggered QBCore:Server:RemoveItem by ID %s for %s %s. This event is deprecated due to exploitation, and will be removed soon. Adjust your events accordingly to do this server side with player functions.", GetInvokingResource(), src, amount, itemName))
|
||||
end)
|
||||
|
||||
RegisterNetEvent('QBCore:Server:AddItem', function(itemName, amount, slot, info)
|
||||
-- This event is exploitable and should not be used. It has been deprecated, and will be removed soon. function(itemName, amount, slot, info)
|
||||
RegisterNetEvent('QBCore:Server:AddItem', function(itemName, amount)
|
||||
local src = source
|
||||
local Player = QBCore.Functions.GetPlayer(src)
|
||||
if not Player then return end
|
||||
Player.Functions.AddItem(itemName, amount, slot, info)
|
||||
print(string.format("%s triggered QBCore:Server:AddItem by ID %s for %s %s. This event is deprecated due to exploitation, and will be removed soon. Adjust your events accordingly to do this server side with player functions.", GetInvokingResource(), src, amount, itemName))
|
||||
end)
|
||||
|
||||
-- Non-Chat Command Calling (ex: qb-adminmenu)
|
||||
|
||||
Reference in New Issue
Block a user