starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-29 09:18:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor changes

Browse Source
This commit is contained in:
ElPumpo
2019-02-28 12:57:54 +01:00
parent 5ab6123b44
commit 9a39f83aee
3 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/main.lua
-1
View File
@@ -254,7 +254,6 @@ RegisterNetEvent('esx:loadIPL')
AddEventHandler('esx:loadIPL', function(name)
Citizen.CreateThread(function()
LoadMpDlcMaps()
EnableMpDlcMaps(true)
RequestIpl(name)
end)
end)
server/classes/player.lua
+11 -13
View File
@@ -48,8 +48,8 @@ function CreateExtendedPlayer(player, accounts, inventory, job, loadout, name, l
self.player.coords = {x = x, y = y, z = z}
end
self.kick = function(r)
self.player.kick(r)
self.kick = function(reason)
self.player.kick(reason)
end
self.addMoney = function(money)
@@ -237,8 +237,7 @@ function CreateExtendedPlayer(player, accounts, inventory, job, loadout, name, l
self.createAccounts = function(missingAccounts, cb)
for i=1, #missingAccounts, 1 do
MySQL.Async.execute('INSERT INTO `user_accounts` (identifier, name) VALUES (@identifier, @name)',
{
MySQL.Async.execute('INSERT INTO `user_accounts` (identifier, name) VALUES (@identifier, @name)', {
['@identifier'] = self.getIdentifier(),
['@name'] = missingAccounts[i]
}, function(rowsChanged)
@@ -317,8 +316,8 @@ function CreateExtendedPlayer(player, accounts, inventory, job, loadout, name, l
local newCount = item.count + count
item.count = newCount
TriggerEvent("esx:onAddInventoryItem", self.source, item, count)
TriggerClientEvent("esx:addInventoryItem", self.source, item, count)
TriggerEvent('esx:onAddInventoryItem', self.source, item, count)
TriggerClientEvent('esx:addInventoryItem', self.source, item, count)
end
self.removeInventoryItem = function(name, count)
@@ -326,8 +325,8 @@ function CreateExtendedPlayer(player, accounts, inventory, job, loadout, name, l
local newCount = item.count - count
item.count = newCount
TriggerEvent("esx:onRemoveInventoryItem", self.source, item, count)
TriggerClientEvent("esx:removeInventoryItem", self.source, item, count)
TriggerEvent('esx:onRemoveInventoryItem', self.source, item, count)
TriggerClientEvent('esx:removeInventoryItem', self.source, item, count)
end
self.setInventoryItem = function(name, count)
@@ -336,15 +335,14 @@ function CreateExtendedPlayer(player, accounts, inventory, job, loadout, name, l
item.count = count
if oldCount > item.count then
TriggerEvent("esx:onRemoveInventoryItem", self.source, item, oldCount - item.count)
TriggerClientEvent("esx:removeInventoryItem", self.source, item, oldCount - item.count)
TriggerEvent('esx:onRemoveInventoryItem', self.source, item, oldCount - item.count)
TriggerClientEvent('esx:removeInventoryItem', self.source, item, oldCount - item.count)
else
TriggerEvent("esx:onAddInventoryItem", self.source, item, item.count - oldCount)
TriggerClientEvent("esx:addInventoryItem", self.source, item, item.count - oldCount)
TriggerEvent('esx:onAddInventoryItem', self.source, item, item.count - oldCount)
TriggerClientEvent('esx:addInventoryItem', self.source, item, item.count - oldCount)
end
end
self.setJob = function(name, grade)
self.setJob = function(job, grade)
local lastJob = json.decode(json.encode(self.job))
server/functions.lua
+3 -6
View File
@@ -46,8 +46,7 @@ ESX.SavePlayer = function(xPlayer, cb)
if ESX.LastPlayerData[xPlayer.source].accounts[xPlayer.accounts[i].name] ~= xPlayer.accounts[i].money then
table.insert(asyncTasks, function(cb)
MySQL.Async.execute('UPDATE user_accounts SET `money` = @money WHERE identifier = @identifier AND name = @name',
{
MySQL.Async.execute('UPDATE user_accounts SET `money` = @money WHERE identifier = @identifier AND name = @name', {
['@money'] = xPlayer.accounts[i].money,
['@identifier'] = xPlayer.identifier,
['@name'] = xPlayer.accounts[i].name
@@ -68,8 +67,7 @@ ESX.SavePlayer = function(xPlayer, cb)
if ESX.LastPlayerData[xPlayer.source].items[xPlayer.inventory[i].name] ~= xPlayer.inventory[i].count then
table.insert(asyncTasks, function(cb)
MySQL.Async.execute('UPDATE user_inventory SET `count` = @count WHERE identifier = @identifier AND item = @item',
{
MySQL.Async.execute('UPDATE user_inventory SET `count` = @count WHERE identifier = @identifier AND item = @item', {
['@count'] = xPlayer.inventory[i].count,
['@identifier'] = xPlayer.identifier,
['@item'] = xPlayer.inventory[i].name
@@ -86,8 +84,7 @@ ESX.SavePlayer = function(xPlayer, cb)
-- Job, loadout and position
table.insert(asyncTasks, function(cb)
MySQL.Async.execute('UPDATE users SET `job` = @job, `job_grade` = @job_grade, `loadout` = @loadout, `position` = @position WHERE identifier = @identifier',
{
MySQL.Async.execute('UPDATE users SET `job` = @job, `job_grade` = @job_grade, `loadout` = @loadout, `position` = @position WHERE identifier = @identifier', {
['@job'] = xPlayer.job.name,
['@job_grade'] = xPlayer.job.grade,
['@loadout'] = json.encode(xPlayer.getLoadout()),