diff --git a/server/cocaine.lua b/server/cocaine.lua index 4118ffd..28c85a8 100644 --- a/server/cocaine.lua +++ b/server/cocaine.lua @@ -54,7 +54,7 @@ end) RegisterServerEvent('md-drugs:server:cutcokeone', function() local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) local count = 0 if Config.TierSystem then local cokeTiers = { @@ -79,7 +79,7 @@ end) RegisterServerEvent('md-drugs:server:bagcoke', function() local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) local count = 0 if Config.TierSystem then local coke = getRep(src, 'coke') @@ -108,7 +108,7 @@ local cokecut = {loosecokestagetwo = 2, loosecokestagethree = 3} for k, v in pairs (cokecut) do QBCore.Functions.CreateUseableItem(k, function(source, item) local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) if Player.Functions.GetItemByName(item.name) then if not Itemcheck(src, 'bakingsoda', 1) then return end TriggerClientEvent('md-drugs:client:minusTier', src, {type = 'coke', xt = 'bakingsoda', item = k, amount = v,recieve = 'loosecoke'}) diff --git a/server/consumables.lua b/server/consumables.lua index ea97049..1236bdf 100644 --- a/server/consumables.lua +++ b/server/consumables.lua @@ -18,7 +18,7 @@ RegisterNetEvent('md-drugs:server:removeconsum', function(item) end) RegisterNetEvent('md-drugs:server:updatestatus', function(stat, statval) - local Player = QBCore.Functions.GetPlayer(source) + local Player = getPlayer(source) if stat == "thirst" then local value = Player.PlayerData.metadata.thirst + statval Player.Functions.SetMetaData('hunger', value) diff --git a/server/cornerselling.lua b/server/cornerselling.lua index 4109297..02ad356 100644 --- a/server/cornerselling.lua +++ b/server/cornerselling.lua @@ -1,7 +1,7 @@ local QBCore = exports['qb-core']:GetCoreObject() lib.callback.register('md-drugs:server:cornerselling:getAvailableDrugs', function(source, cb) - local Player = QBCore.Functions.GetPlayer(source) + local Player = getPlayer(source) local rep = getRep(source, 'cornerselling') if not Player then return nil end local type = 0 @@ -25,7 +25,7 @@ end) RegisterNetEvent('md-drugs:server:sellCornerDrugs', function(item, amount, price) local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) if RemoveItem(src, item, amount) then AddRep(src, 'cornerselling', QBConfig.DrugsPrice[item].rep * amount) Log(GetName(src) .. ' Sold ' .. amount .. ' Of ' .. item .. ' For A Price Of ' .. price .. '!' , 'cornerselling') @@ -47,11 +47,10 @@ end) lib.addCommand('cornersell', { help = 'Sell Things On The Corner', params = { - }, }, function(source, args, raw) local src = source - local Player = QBCore.Functions.GetPlayer(source) + local Player = getPlayer(src) Log(GetName(source) .. ' Used Command cornersell!' , 'cornerselling') TriggerClientEvent('md-drugs:client:cornerselling', src) end) diff --git a/server/crack.lua b/server/crack.lua index d326254..893f095 100644 --- a/server/crack.lua +++ b/server/crack.lua @@ -2,7 +2,7 @@ local QBCore = exports['qb-core']:GetCoreObject() RegisterServerEvent('md-drugs:server:makecrackone', function(num) local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) local count,type, tier = 0, 'cookcrack', 'tier1' if CheckDist(src, Config.makecrack[num]['loc']) then return end if Config.TierSystem then @@ -26,7 +26,7 @@ end) RegisterServerEvent('md-drugs:server:bagcrack', function(num) local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) local count,type, tier = 0, 'bagcrack', 'tier1' if Config.TierSystem then local crackTiers = { @@ -50,7 +50,7 @@ local cokecut = {crackrockstagetwo = 2, crackrockstagethree = 3} for k, v in pairs (cokecut) do QBCore.Functions.CreateUseableItem(k, function(source, item) local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) if Player.Functions.GetItemByName(item.name) then if not Itemcheck(src, 'bakingsoda', 1) then return end TriggerClientEvent('md-drugs:client:minusTier', src, {type = 'crack', xt = 'bakingsoda', item = k, amount = v,recieve = 'crackrock'}) diff --git a/server/deliveries.lua b/server/deliveries.lua index 920bf3e..6f17ca4 100644 --- a/server/deliveries.lua +++ b/server/deliveries.lua @@ -18,7 +18,7 @@ end) lib.callback.register('md-drugs:server:GetDeliveryItem', function(data) local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) local item = math.random(1, #QBConfig.DeliveryItems) local amount = math.random(1,4) local check = MySQL.query.await('SELECT * FROM deliveriesdealer WHERE cid = ?', {Player.PlayerData.citizenid}) @@ -44,7 +44,7 @@ end) RegisterNetEvent('md-drugs:server:giveDeliveryItems', function(item, amount) local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) local check = MySQL.query.await('SELECT * FROM deliveriesdealer WHERE cid = ?', {Player.PlayerData.citizenid}) if not check[1] then return end local time = os.time() @@ -69,7 +69,7 @@ end) QBCore.Commands.Add("newdealer", "Place a dealer (Admin Only)", {{ name = "name", help = "Dealer name"}, { name = "min", help = "Minimum Time"}, {name = "max", help = "Maximum Time"}}, true, function(source, args) local ped = GetPlayerPed(source) local coords = GetEntityCoords(ped) - local Player = QBCore.Functions.GetPlayer(source) + local Player = getPlayer(source) if not Player then return end local dealerName = args[1] local minTime = tonumber(args[2]) @@ -113,7 +113,8 @@ QBCore.Commands.Add("deletedealer", "Delete a dealer (Admin Only)", {{ end, "admin") RegisterServerEvent("md-drugs:server:Dealershop", function(amount, value, item, info) - local src = source local Player = QBCore.Functions.GetPlayer(src) + local src = source + local Player = getPlayer(src) local balance = Player.Functions.GetMoney(tostring(value)) if Player.Functions.RemoveMoney(tostring(value), tonumber(info) * tonumber(amount)) then TriggerClientEvent('inventory:client:ItemBox', src, item.name, "add", amount) diff --git a/server/functions.lua b/server/functions.lua index 105ade2..69ae2a6 100644 --- a/server/functions.lua +++ b/server/functions.lua @@ -66,50 +66,16 @@ else inventory = 'qb' end end) ------------------------------------- functions ---- ---- -function Notifys(source, text, type) +------------------------------------ Player Stuff functions +function getPlayer(source) local src = source - if notify == 'qb' then - TriggerClientEvent("QBCore:Notify", src, text, type) - elseif notify == 'ox' then - lib.notify(src, { title = text, type = type}) - elseif notify == 'okok' then - TriggerClientEvent('okokNotify:Alert', src, '', text, 4000, type, false) - else - print"^1 Look At The Config For Proper Alert Options" - end + local Player = QBCore.Functions.GetPlayer(src) + return Player end -function GetLabels(item) - if inventory == 'qb' then - return QBCore.Shared.Items[item].label - elseif inventory == 'ox' then - local items = exports.ox_inventory:Items() - return items[item].label - end -end - -function Itemcheck(source, item, amount) - if inventory == 'qb' then - local Player = QBCore.Functions.GetPlayer(source) - local itemchecks = Player.Functions.GetItemByName(item) - if itemchecks and itemchecks.amount >= amount then - return true - else - Notifys(source, 'You Need ' .. amount .. ' Of ' .. GetLabels(item) .. ' To Do this', 'error') - return false - end - elseif inventory == 'ox' then - local items = exports.ox_inventory:GetItem(source, item, nil, false) - if items.count >= amount then - return true - else - Notifys(source, 'You Need ' .. amount .. ' Of ' .. GetLabels(item) .. ' To Do This', 'error') - return false - end - end +function GetName(source) + local Player = getPlayer(source) + return Player.PlayerData.charinfo.firstname .. ' ' .. Player.PlayerData.charinfo.lastname end function GetCoords(source) @@ -137,22 +103,53 @@ function CheckDist(source, coords) end end -function checkTable(table) - local need = 0 - local have = 0 - for k, v in pairs (table) do - need = need + 1 - if Itemcheck(source, k, v) then have = have + 1 end - end - if need == have then - return true - else - end + +function Notifys(source, text, type) + local src = source + if notify == 'qb' then + TriggerClientEvent("QBCore:Notify", src, text, type) + elseif notify == 'ox' then + lib.notify(src, { title = text, type = type}) + elseif notify == 'okok' then + TriggerClientEvent('okokNotify:Alert', src, '', text, 4000, type, false) + else + print"^1 Look At The Config For Proper Alert Options" + end +end + +function GetLabels(item) + if inventory == 'qb' then + return QBCore.Shared.Items[item].label + elseif inventory == 'ox' then + local items = exports.ox_inventory:Items() + return items[item].label + end +end + +function Itemcheck(source, item, amount) + if inventory == 'qb' then + local Player = getPlayer(source) + local itemchecks = Player.Functions.GetItemByName(item) + if itemchecks and itemchecks.amount >= amount then + return true + else + Notifys(source, 'You Need ' .. amount .. ' Of ' .. GetLabels(item) .. ' To Do this', 'error') + return false + end + elseif inventory == 'ox' then + local items = exports.ox_inventory:GetItem(source, item, nil, false) + if items.count >= amount then + return true + else + Notifys(source, 'You Need ' .. amount .. ' Of ' .. GetLabels(item) .. ' To Do This', 'error') + return false + end + end end function RemoveItem(source, item, amount) if inventory == 'qb' then - local Player = QBCore.Functions.GetPlayer(source) + local Player = getPlayer(source) if Player.Functions.RemoveItem(item, amount) then TriggerClientEvent(invname ..":client:ItemBox", source, QBCore.Shared.Items[item], "remove", amount) return true @@ -170,7 +167,7 @@ end function AddItem(source, item, amount) if inventory == 'qb' then - local Player = QBCore.Functions.GetPlayer(source) + local Player = getPlayer(source) if Player.Functions.AddItem(item, amount) then TriggerClientEvent(invname ..":client:ItemBox", source, QBCore.Shared.Items[item], "add", amount) return true @@ -190,13 +187,9 @@ function AddItem(source, item, amount) end end -function GetName(source) - local Player = QBCore.Functions.GetPlayer(source) - return Player.PlayerData.charinfo.firstname .. ' ' .. Player.PlayerData.charinfo.lastname -end function getRep(source, type) - local Player = QBCore.Functions.GetPlayer(source) + local Player = getPlayer(source) local sql = MySQL.query.await('SELECT * FROM drugrep WHERE cid = ?', {Player.PlayerData.citizenid}) if not sql[1] then local table = json.encode({ @@ -236,7 +229,7 @@ function getRep(source, type) end function GetAllRep(source) - local Player = QBCore.Functions.GetPlayer(source) + local Player = getPlayer(source) local sql = MySQL.query.await('SELECT * FROM drugrep WHERE cid = ?', {Player.PlayerData.citizenid}) if not sql[1] then local table = json.encode({ @@ -263,7 +256,7 @@ end function AddRep(source, type, amount) if not amount then amount = 1 end - local Player = QBCore.Functions.GetPlayer(source) + local Player = getPlayer(source) local sql = MySQL.query.await('SELECT * FROM drugrep WHERE cid = ?', {Player.PlayerData.citizenid}) local reps = json.decode(sql[1].drugrep) local update @@ -325,7 +318,7 @@ function sortTab(tbl, type) end function ChecknRemove(source, table) - local Player = QBCore.Functions.GetPlayer(source) + local Player = getPlayer(source) local hass = 0 local need = 0 for k, v in pairs (table) do diff --git a/server/heroin.lua b/server/heroin.lua index c013391..fb9b258 100644 --- a/server/heroin.lua +++ b/server/heroin.lua @@ -68,7 +68,7 @@ end) RegisterServerEvent('md-drugs:server:cutheroin', function(num) local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) if CheckDist(source, Config.cutheroinone[num]['loc']) then return end if not Itemcheck(src, 'bakingsoda', 1) then return end if Config.TierSystem then @@ -95,7 +95,7 @@ end) RegisterServerEvent('md-drugs:server:getheroinlabkit', function() local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) if CheckDist(source, vector3(Config.buyheroinlabkit.x,Config.buyheroinlabkit.y,Config.buyheroinlabkit.z)) then return end if Player.Functions.RemoveMoney('cash', Config.heroinlabkitprice) then @@ -108,7 +108,7 @@ end) RegisterServerEvent('md-drugs:server:getheroinlabkitback', function() local src = source -local Player = QBCore.Functions.GetPlayer(src) +local Player = getPlayer(src) if AddItem(src, "heroinlabkit", 1) then Log(GetName(src) ..' Picked Up Their Heroin Lab Kit Back At ' .. GetCoords(src) .. '!', 'heroin') end @@ -116,7 +116,7 @@ end) QBCore.Functions.CreateUseableItem('heroinlabkit', function(source, item) local src = source -local Player = QBCore.Functions.GetPlayer(src) +local Player = getPlayer(src) if not Itemcheck(source, 'heroinlabkit', 1) then return end if TriggerClientEvent("md-drugs:client:setheroinlabkit", src) then RemoveItem(src, "heroinlabkit", 1) @@ -128,7 +128,7 @@ end) RegisterServerEvent('md-drugs:server:heatliquidheroin', function() local src = source -local Player = QBCore.Functions.GetPlayer(src) +local Player = getPlayer(src) if not Itemcheck(source, 'emptyvial', 1) then return end if Config.TierSystem then local cuth = Player.Functions.GetItemByName('heroincut') @@ -154,7 +154,7 @@ end) RegisterServerEvent('md-drugs:server:failheatingheroin', function() local src = source -local Player = QBCore.Functions.GetPlayer(src) +local Player = getPlayer(src) local cuth = Player.Functions.GetItemByName('heroincut') local cuth2 = Player.Functions.GetItemByName('heroincutstagetwo') local cuth3 = Player.Functions.GetItemByName('heroincutstagethree') @@ -174,7 +174,7 @@ end) RegisterServerEvent('md-drugs:server:fillneedle', function(num) local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) if CheckDist(source, Config.fillneedle[num]['loc']) then return end if not Itemcheck(src, 'needle', 1) then return end if Config.TierSystem then @@ -207,7 +207,7 @@ end) RegisterServerEvent('md-drugs:server:failheroin', function() local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) Log(GetName(src) ..' Sucks And Burned Their Heroin', 'heroin') if Config.TierSystem then local vh = Player.Functions.GetItemByName('heroinvial') diff --git a/server/lsd.lua b/server/lsd.lua index 02fafda..01a2b6d 100644 --- a/server/lsd.lua +++ b/server/lsd.lua @@ -104,7 +104,7 @@ end) RegisterServerEvent('md-drugs:server:gettabpaper', function(num) local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) if CheckDist(source, Config.gettabs[num]['loc']) then return end if Player.Functions.RemoveMoney('cash', Config.tabcost * 10) then AddItem(src,'tab_paper', 10) @@ -116,7 +116,7 @@ end) RegisterServerEvent('md-drugs:server:getlabkit', function() local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) if CheckDist(source, vector3(Config.buylsdlabkit.x, Config.buylsdlabkit.y, Config.buylsdlabkit.z)) then return end if Player.Functions.RemoveMoney('cash', Config.lsdlabkitcost) then AddItem(src,'lsdlabkit', 1) @@ -161,7 +161,7 @@ local sheets = { for k, v in pairs (sheets) do QBCore.Functions.CreateUseableItem(v.item, function(source) local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) local math = math.random(1,10) if RemoveItem(src, v.item, 1) then AddItem(src, v.recieve, math) diff --git a/server/oxyruns.lua b/server/oxyruns.lua index 610067f..283c520 100644 --- a/server/oxyruns.lua +++ b/server/oxyruns.lua @@ -2,7 +2,7 @@ QBCore = exports['qb-core']:GetCoreObject() lib.callback.register('md-drugs:server:payfortruck', function() local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) if Player.Functions.RemoveMoney('cash', Config.TruckPrice ) or Player.Functions.RemoveMoney('bank', Config.TruckPrice ) then Log(GetName(src) .. ' Rented A Van For OxyRuns', 'oxy') return true @@ -15,7 +15,7 @@ end) RegisterServerEvent('md-drugs:server:giveoxybox', function() local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) local chance = math.random(1,100) local cash = Config.OxyRunCompleteCash local itemchance = math.random(1,100) diff --git a/server/pharma.lua b/server/pharma.lua index 6775310..39b15a6 100644 --- a/server/pharma.lua +++ b/server/pharma.lua @@ -2,7 +2,7 @@ local QBCore = exports['qb-core']:GetCoreObject() local function GetJob(source) local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) if Player.PlayerData.job.type == 'ems' then return true else @@ -45,7 +45,7 @@ end RegisterServerEvent('md-drugs:server:fillprescription', function() local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) local vic = Player.Functions.GetItemByName('vicodin_prescription') local add = Player.Functions.GetItemByName('adderal_prescription') local mor = Player.Functions.GetItemByName('morphine_prescription') diff --git a/server/recipes.lua b/server/recipes.lua index 66f0ff0..361ba0b 100644 --- a/server/recipes.lua +++ b/server/recipes.lua @@ -137,7 +137,7 @@ local recipe = { function GetRecipe(source, type, method, tier) local src = source - local Player = QBCore.Functions.GetPlayer(source) + local Player = getPlayer(source) local has = 0 local need = 0 for k, v in pairs (recipe[type][method][tier].take) do diff --git a/server/travellingmerchant.lua b/server/travellingmerchant.lua index 51b8f6f..427d561 100644 --- a/server/travellingmerchant.lua +++ b/server/travellingmerchant.lua @@ -67,7 +67,7 @@ lib.callback.register('md-drugs:server:menu', function(source, data) end) RegisterServerEvent("md-drugs:server:purchaseGoods", function(amount, money, item, price,table,num) - local src = source local Player = QBCore.Functions.GetPlayer(src) + local src = source local Player = getPlayer(src) for i = 1, #table do if table[i].name == item then if not table[i].price == price then return end diff --git a/server/weed.lua b/server/weed.lua index e4acd3c..345b144 100644 --- a/server/weed.lua +++ b/server/weed.lua @@ -37,7 +37,7 @@ end) RegisterServerEvent('md-drugs:server:dryoutweed', function() local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) if RemoveItem(src,"wetcannabis", 1) then AddItem(src,"drycannabis", 1) Log(GetName(source) .. ' Dried Weed', 'weed') @@ -66,21 +66,21 @@ end RegisterServerEvent('md-drugs:server:MakeWeedItems', function(data) local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) if not Player then return end if not GetRecipe(src, data.recipe, data.table, data.item) then return end -end) - -RegisterServerEvent('md-drugs:server:makeoil', function(data) - local src = source - local Player = QBCore.Functions.GetPlayer(src) - if not Player then return end - if not GetRecipe(src, 'weed', 'oil', 'shatter') then return end +end) + +RegisterServerEvent('md-drugs:server:makeoil', function(data) + local src = source + local Player = getPlayer(src) + if not Player then return end + if not GetRecipe(src, 'weed', 'oil', 'shatter') then return end end) QBCore.Functions.CreateUseableItem("dabrig", function(source, item) local src = source -local Player = QBCore.Functions.GetPlayer(src) +local Player = getPlayer(src) if Player.Functions.GetItemByName("butanetorch") then if RemoveItem(src, "shatter", 1) then @@ -102,7 +102,7 @@ end) QBCore.Functions.CreateUseableItem("mdwoods", function(source, item) local src = source -local Player = QBCore.Functions.GetPlayer(src) +local Player = getPlayer(src) TriggerClientEvent("md-drugs:client:rollanim", src) Wait(4000) if RemoveItem(src, "mdwoods",1 ) then diff --git a/server/wholesale.lua b/server/wholesale.lua index ba64a0e..644eb13 100644 --- a/server/wholesale.lua +++ b/server/wholesale.lua @@ -7,13 +7,13 @@ local xtc = {"white_playboys", "white_playboys2", "white_playboys3", "white_p QBCore.Functions.CreateUseableItem("cokeburner", function(source, item) local src = source - local Player = QBCore.Functions.GetPlayer(source) + local Player = getPlayer(source) TriggerClientEvent("md-drugs:client:GetLocation", src, 'coke', "Bring Me All The Coke You Have") end) RegisterServerEvent('md-drugs:server:wholesalecoke', function() local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) local price = math.random(Config.Wcoke.min, Config.Wcoke.max) for k, v in pairs(coke) do @@ -31,14 +31,14 @@ end) QBCore.Functions.CreateUseableItem("crackburner", function(source, item) local src = source - local Player = QBCore.Functions.GetPlayer(source) + local Player = getPlayer(source) TriggerClientEvent("md-drugs:client:GetLocation", src, 'crack', "Bring Me All The Crack You Have") end) RegisterServerEvent('md-drugs:server:wholesalecrack', function() local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) local price = math.random(Config.Wcrack.min, Config.Wcrack.max) for k, v in pairs(crack) do @@ -55,7 +55,7 @@ end) QBCore.Functions.CreateUseableItem("lsdburner", function(source, item) local src = source - local Player = QBCore.Functions.GetPlayer(source) + local Player = getPlayer(source) TriggerClientEvent("md-drugs:client:GetLocation", src, 'lsd', "Bring Me All The lsd You Have") @@ -63,7 +63,7 @@ end) RegisterServerEvent('md-drugs:server:wholesalelsd', function() local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) local price = math.random(Config.Wlsd.min, Config.Wlsd.max) for k, v in pairs(lsd) do @@ -81,14 +81,14 @@ end) QBCore.Functions.CreateUseableItem("heroinburner", function(source, item) local src = source - local Player = QBCore.Functions.GetPlayer(source) + local Player = getPlayer(source) TriggerClientEvent("md-drugs:client:GetLocation", src, 'heroin', "Bring Me All The Heroin You Have") end) RegisterServerEvent('md-drugs:server:wholesaleheroin', function() local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) local price = math.random(Config.WHeroin.min, Config.WHeroin.max) for k, v in pairs(heroin) do @@ -105,14 +105,14 @@ end) ---- xtc QBCore.Functions.CreateUseableItem("xtcburner", function(source, item) local src = source - local Player = QBCore.Functions.GetPlayer(source) + local Player = getPlayer(source) TriggerClientEvent("md-drugs:client:GetLocation", src, 'xtc', "Bring Me All The xtc You Have") end) RegisterServerEvent('md-drugs:server:wholesalextc', function() local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) local price = math.random(Config.WXTC.min, Config.WXTC.max) for k, v in pairs(xtc) do @@ -130,7 +130,7 @@ end) RegisterServerEvent('md-drugs:server:RemoveBurner', function(item) local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) if item == 'coke' then if Player.Functions.RemoveItem('cokeburner', 1) then diff --git a/server/xtc.lua b/server/xtc.lua index 52431d1..31a0e70 100644 --- a/server/xtc.lua +++ b/server/xtc.lua @@ -2,7 +2,7 @@ local QBCore = exports['qb-core']:GetCoreObject() -------------------- stealing ingridients RegisterServerEvent('md-drugs:server:stealisosafrole', function(num) local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) if CheckDist(source, Config.isosafrole[num]['loc']) then return end if AddItem(src, "isosafrole", 1) then Log(GetName(source) .. ' Stole isosafrole with a distance of ' .. dist(source, Config.isosafrole[num]['loc']) .. ' vectors!', 'xtc') @@ -11,7 +11,7 @@ end) RegisterServerEvent('md-drugs:server:stealmdp2p', function(num) local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) if CheckDist(source, Config.mdp2p[num]['loc']) then return end if AddItem(src,"mdp2p", 1) then Log(GetName(source) .. ' Stole MDP2P with a distance of ' .. dist(source, Config.mdp2p[num]['loc']) .. ' vectors!', 'xtc') @@ -27,7 +27,7 @@ local presses = { for k, v in pairs (presses) do QBCore.Functions.CreateUseableItem(v.item, function(source, item) local src = source -local Player = QBCore.Functions.GetPlayer(src) +local Player = getPlayer(src) if TriggerClientEvent("md-drugs:client:setpress", src, v.data) then RemoveItem(src, v.item, 1) Log(GetName(source) .. ' Placed A ' .. v.item .. ' At ' .. GetCoords(source) .. '!', 'xtc') @@ -37,7 +37,7 @@ end RegisterServerEvent('md-drugs:server:getpressback', function(type) local src = source -local Player = QBCore.Functions.GetPlayer(src) +local Player = getPlayer(src) if type == 'single' then if Player.Functions.GetItemByName('singlepress') then Notifys(src, 'You Already Have A Kit') return end AddItem(src, 'singlepress', 1) @@ -60,7 +60,7 @@ end) RegisterServerEvent('md-drugs:server:makextc', function(data) local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) if not Itemcheck(src, 'raw_xtc', 1) then return end if data.data == 'single' then if data.color == 'white' then @@ -123,7 +123,7 @@ end) RegisterServerEvent('md-drugs:server:buypress', function() local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) if Player.Functions.RemoveMoney("cash", 20000) then AddItem(src, "singlepress", 1) @@ -154,7 +154,7 @@ end) ------------- making powder RegisterServerEvent('md-drugs:server:makingrawxtc', function(num) local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) if CheckDist(source, Config.rawxtcloc[num]['loc']) then return end if not GetRecipe(src, 'xtc', 'raw', 'raw_xtc') then return end Log(GetName(source) .. ' Made Raw XTC With A Distance Of ' .. dist(source, Config.rawxtcloc[num]['loc']) .. '!', 'xtc') @@ -162,7 +162,7 @@ end) RegisterServerEvent('md-drugs:server:stampwhite', function(num) local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) local one = {'white_playboys', 'white_aliens', 'white_pl', 'white_trolls', 'white_cats'} local chance = math.random(#one) local two = {'white_playboys2', 'white_aliens2', 'white_pl2', 'white_trolls2', 'white_cats2'} @@ -192,7 +192,7 @@ end) RegisterServerEvent('md-drugs:server:stampred', function(num) local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) local one = {'red_playboys', 'red_aliens', 'red_pl', 'red_trolls', 'red_cats'} local chance = math.random(#one) local two = {'red_playboys2', 'red_aliens2', 'red_pl2', 'red_trolls2', 'red_cats2'} @@ -223,7 +223,7 @@ end) RegisterServerEvent('md-drugs:server:stamporange', function(num) local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) local one = {'orange_playboys', 'orange_aliens', 'orange_pl', 'orange_trolls', 'orange_cats'} local chance = math.random(#one) local two = {'orange_playboys2', 'orange_aliens2', 'orange_pl2', 'orange_trolls2', 'orange_cats2'} @@ -254,7 +254,7 @@ end) RegisterServerEvent('md-drugs:server:stampblue', function(num) local src = source - local Player = QBCore.Functions.GetPlayer(src) + local Player = getPlayer(src) local one = {'blue_playboys', 'blue_aliens', 'blue_pl', 'blue_trolls', 'blue_cats'} local chance = math.random(#one) local two = {'blue_playboys2', 'blue_aliens2', 'blue_pl2', 'blue_trolls2', 'blue_cats2'}