From d70d4af99606219e83d5d7356ddf030dd3389df4 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 4 Nov 2018 22:50:01 +0100 Subject: [PATCH] Minor changes --- client/main.lua | 3 +++ server/main.lua | 20 +++++--------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/client/main.lua b/client/main.lua index 03901014..2d9b5f9f 100644 --- a/client/main.lua +++ b/client/main.lua @@ -53,13 +53,16 @@ function SetUnsetAccessory(accessory) TriggerEvent('skinchanger:getSkin', function(skin) local mAccessory = -1 local mColor = 0 + if _accessory == "mask" then mAccessory = 0 end + if skin[_accessory .. '_1'] == mAccessory then mAccessory = accessorySkin[_accessory .. '_1'] mColor = accessorySkin[_accessory .. '_2'] end + local accessorySkin = {} accessorySkin[_accessory .. '_1'] = mAccessory accessorySkin[_accessory .. '_2'] = mColor diff --git a/server/main.lua b/server/main.lua index 1b614f92..6c674ae2 100644 --- a/server/main.lua +++ b/server/main.lua @@ -4,11 +4,10 @@ TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) RegisterServerEvent('esx_accessories:pay') AddEventHandler('esx_accessories:pay', function() - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) - xPlayer.removeMoney(Config.Price) - TriggerClientEvent('esx:showNotification', _source, _U('you_paid', Config.Price)) + local xPlayer = ESX.GetPlayerFromId(source) + xPlayer.removeMoney(Config.Price) + TriggerClientEvent('esx:showNotification', source, _U('you_paid', Config.Price)) end) RegisterServerEvent('esx_accessories:save') @@ -17,7 +16,6 @@ AddEventHandler('esx_accessories:save', function(skin, accessory) local xPlayer = ESX.GetPlayerFromId(_source) TriggerEvent('esx_datastore:getDataStore', 'user_' .. string.lower(accessory), xPlayer.identifier, function(store) - store.set('has' .. accessory, true) local itemSkin = {} @@ -25,22 +23,19 @@ AddEventHandler('esx_accessories:save', function(skin, accessory) local item2 = string.lower(accessory) .. '_2' itemSkin[item1] = skin[item1] itemSkin[item2] = skin[item2] + store.set('skin', itemSkin) - end) - end) ESX.RegisterServerCallback('esx_accessories:get', function(source, cb, accessory) local xPlayer = ESX.GetPlayerFromId(source) TriggerEvent('esx_datastore:getDataStore', 'user_' .. string.lower(accessory), xPlayer.identifier, function(store) - local hasAccessory = (store.get('has' .. accessory) and store.get('has' .. accessory) or false) local skin = (store.get('skin') and store.get('skin') or {}) cb(hasAccessory, skin) - end) end) @@ -48,10 +43,5 @@ end) ESX.RegisterServerCallback('esx_accessories:checkMoney', function(source, cb) local xPlayer = ESX.GetPlayerFromId(source) - if xPlayer.get('money') >= Config.Price then - cb(true) - else - cb(false) - end - + cb(xPlayer.get('money') >= Config.Price) end)