From 89bb9356853eb55c6b9e2c4842a752a4acba2765 Mon Sep 17 00:00:00 2001 From: Miho Date: Wed, 25 Jun 2025 01:22:18 +0200 Subject: [PATCH 1/5] resources/[jobs]/[civ]/mh_jobgarage/server/server.lua aktualisiert --- resources/[jobs]/[civ]/mh_jobgarage/server/server.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/[jobs]/[civ]/mh_jobgarage/server/server.lua b/resources/[jobs]/[civ]/mh_jobgarage/server/server.lua index 79b5436aa..0e2d14317 100644 --- a/resources/[jobs]/[civ]/mh_jobgarage/server/server.lua +++ b/resources/[jobs]/[civ]/mh_jobgarage/server/server.lua @@ -46,7 +46,7 @@ AddEventHandler('mh_jobgarage:DeleteFromList', function(plate) local veh_opt = MySQL.query("SELECT * FROM mh_jobgarage WHERE plate = ?", {plate}) MySQL.query("SELECT * FROM vehicle_keys WHERE plate = ? and owner = ?", {plate, pedid}, function(rs) - if rs[1] ~= nil then + if rs ~= nil and rs[1] ~= nil then MySQL.query("UPDATE vehicle_keys SET count = count + ? WHERE plate = ? and owner = ?", {rs[1].count, plate, pedid},function(rowsChange) if rowsChange then TriggerClientEvent('mh_jobgarage:notify', _source, "Schlüsselkasten", "Du hast "..rs[1].count.."x Schlüssel bekommen.", "success") From 631e808a9141438332f4dda6f4092c02b24ca6fc Mon Sep 17 00:00:00 2001 From: Miho Date: Wed, 25 Jun 2025 01:26:35 +0200 Subject: [PATCH 2/5] resources/[jobs]/[civ]/mh_jobgarage/server/server.lua aktualisiert --- resources/[jobs]/[civ]/mh_jobgarage/server/server.lua | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/resources/[jobs]/[civ]/mh_jobgarage/server/server.lua b/resources/[jobs]/[civ]/mh_jobgarage/server/server.lua index 0e2d14317..c3b5a271f 100644 --- a/resources/[jobs]/[civ]/mh_jobgarage/server/server.lua +++ b/resources/[jobs]/[civ]/mh_jobgarage/server/server.lua @@ -43,19 +43,20 @@ AddEventHandler('mh_jobgarage:DeleteFromList', function(plate) local _source = source local Player = QBCore.Functions.GetPlayer(_source) local pedid = Player.PlayerData.citizenid - local veh_opt = MySQL.query("SELECT * FROM mh_jobgarage WHERE plate = ?", {plate}) + local veh_optt = MySQL.query("SELECT * FROM mh_jobgarage WHERE plate = ?", {plate}) + local veh_opt = json.encode(veh_optt) MySQL.query("SELECT * FROM vehicle_keys WHERE plate = ? and owner = ?", {plate, pedid}, function(rs) if rs ~= nil and rs[1] ~= nil then - MySQL.query("UPDATE vehicle_keys SET count = count + ? WHERE plate = ? and owner = ?", {rs[1].count, plate, pedid},function(rowsChange) + MySQL.query("UPDATE vehicle_keys SET count = count + ? WHERE plate = ? and owner = ?", {veh_opt.count, plate, pedid},function(rowsChange) if rowsChange then - TriggerClientEvent('mh_jobgarage:notify', _source, "Schlüsselkasten", "Du hast "..rs[1].count.."x Schlüssel bekommen.", "success") + TriggerClientEvent('mh_jobgarage:notify', _source, "Schlüsselkasten", "Du hast "..veh_opt.count.."x Schlüssel bekommen.", "success") end end) else - MySQL.query("INSERT INTO vehicle_keys(owner, plate, count) VALUES (?, ?, ?)", {pedid, plate, rs[1].count}, function(rowsChange) + MySQL.query("INSERT INTO vehicle_keys(owner, plate, count) VALUES (?, ?, ?)", {pedid, plate, veh_opt.count}, function(rowsChange) if rowsChange then - TriggerClientEvent('mh_jobgarage:notify', _source, "Schlüsselkasten", "Du hast "..rs[1].count.."x Schlüssel bekommen.", "success") + TriggerClientEvent('mh_jobgarage:notify', _source, "Schlüsselkasten", "Du hast "..veh_opt.count.."x Schlüssel bekommen.", "success") end end) end From 82dfd312c539ad2b7987fed3af5553f055fb0c14 Mon Sep 17 00:00:00 2001 From: Miho Date: Wed, 25 Jun 2025 01:29:22 +0200 Subject: [PATCH 3/5] resources/[jobs]/[civ]/mh_jobgarage/server/server.lua aktualisiert --- resources/[jobs]/[civ]/mh_jobgarage/server/server.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/[jobs]/[civ]/mh_jobgarage/server/server.lua b/resources/[jobs]/[civ]/mh_jobgarage/server/server.lua index c3b5a271f..fa63ab898 100644 --- a/resources/[jobs]/[civ]/mh_jobgarage/server/server.lua +++ b/resources/[jobs]/[civ]/mh_jobgarage/server/server.lua @@ -43,8 +43,8 @@ AddEventHandler('mh_jobgarage:DeleteFromList', function(plate) local _source = source local Player = QBCore.Functions.GetPlayer(_source) local pedid = Player.PlayerData.citizenid - local veh_optt = MySQL.query("SELECT * FROM mh_jobgarage WHERE plate = ?", {plate}) - local veh_opt = json.encode(veh_optt) + local veh_opt = MySQL.query("SELECT * FROM mh_jobgarage WHERE plate = ?", {plate}) + --local veh_opt = json.encode(veh_optt) MySQL.query("SELECT * FROM vehicle_keys WHERE plate = ? and owner = ?", {plate, pedid}, function(rs) if rs ~= nil and rs[1] ~= nil then From 728ac0c2d15b8c28a413d7c611ad3b6b218ad9d2 Mon Sep 17 00:00:00 2001 From: Miho Date: Wed, 25 Jun 2025 01:31:41 +0200 Subject: [PATCH 4/5] resources/[jobs]/[civ]/mh_jobgarage/server/server.lua aktualisiert --- resources/[jobs]/[civ]/mh_jobgarage/server/server.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/[jobs]/[civ]/mh_jobgarage/server/server.lua b/resources/[jobs]/[civ]/mh_jobgarage/server/server.lua index fa63ab898..3561c4c09 100644 --- a/resources/[jobs]/[civ]/mh_jobgarage/server/server.lua +++ b/resources/[jobs]/[civ]/mh_jobgarage/server/server.lua @@ -43,7 +43,8 @@ AddEventHandler('mh_jobgarage:DeleteFromList', function(plate) local _source = source local Player = QBCore.Functions.GetPlayer(_source) local pedid = Player.PlayerData.citizenid - local veh_opt = MySQL.query("SELECT * FROM mh_jobgarage WHERE plate = ?", {plate}) + local veh_opt = MySQL.query.await("SELECT * FROM mh_jobgarage WHERE plate = ?", {plate}) + print(json.encode(veh_opt)) --local veh_opt = json.encode(veh_optt) MySQL.query("SELECT * FROM vehicle_keys WHERE plate = ? and owner = ?", {plate, pedid}, function(rs) From 4caf26bdea72bf0b62853c25e6a7d56f3509fcf2 Mon Sep 17 00:00:00 2001 From: Miho Date: Wed, 25 Jun 2025 01:39:45 +0200 Subject: [PATCH 5/5] resources/[jobs]/[civ]/mh_jobgarage/server/server.lua aktualisiert --- .../[civ]/mh_jobgarage/server/server.lua | 41 ++++++++++++------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/resources/[jobs]/[civ]/mh_jobgarage/server/server.lua b/resources/[jobs]/[civ]/mh_jobgarage/server/server.lua index 3561c4c09..4f85026b9 100644 --- a/resources/[jobs]/[civ]/mh_jobgarage/server/server.lua +++ b/resources/[jobs]/[civ]/mh_jobgarage/server/server.lua @@ -43,26 +43,37 @@ AddEventHandler('mh_jobgarage:DeleteFromList', function(plate) local _source = source local Player = QBCore.Functions.GetPlayer(_source) local pedid = Player.PlayerData.citizenid - local veh_opt = MySQL.query.await("SELECT * FROM mh_jobgarage WHERE plate = ?", {plate}) - print(json.encode(veh_opt)) - --local veh_opt = json.encode(veh_optt) - - MySQL.query("SELECT * FROM vehicle_keys WHERE plate = ? and owner = ?", {plate, pedid}, function(rs) + local keycounter = nil + MySQL.query("SELECT value FROM mh_jobgarage WHERE plate = ?", {plate}, function(rs) if rs ~= nil and rs[1] ~= nil then - MySQL.query("UPDATE vehicle_keys SET count = count + ? WHERE plate = ? and owner = ?", {veh_opt.count, plate, pedid},function(rowsChange) - if rowsChange then - TriggerClientEvent('mh_jobgarage:notify', _source, "Schlüsselkasten", "Du hast "..veh_opt.count.."x Schlüssel bekommen.", "success") - end - end) + keycounter = rs[1].value else - MySQL.query("INSERT INTO vehicle_keys(owner, plate, count) VALUES (?, ?, ?)", {pedid, plate, veh_opt.count}, function(rowsChange) - if rowsChange then - TriggerClientEvent('mh_jobgarage:notify', _source, "Schlüsselkasten", "Du hast "..veh_opt.count.."x Schlüssel bekommen.", "success") - end - end) + keycounter = 0 end end) + if keycounter == nil then + TriggerClientEvent('mh_jobgarage:notify', _source, "Schlüsselkasten", "Fehler, versuche es Später erneut.", "inform") + end + + if keycounter ~= 0 then + MySQL.query("SELECT * FROM vehicle_keys WHERE plate = ? and owner = ?", {plate, pedid}, function(rs) + if rs ~= nil and rs[1] ~= nil then + MySQL.query("UPDATE vehicle_keys SET count = count + ? WHERE plate = ? and owner = ?", {keycounter, plate, pedid},function(rowsChange) + if rowsChange then + TriggerClientEvent('mh_jobgarage:notify', _source, "Schlüsselkasten", "Du hast "..keycounter.."x Schlüssel bekommen.", "success") + end + end) + else + MySQL.query("INSERT INTO vehicle_keys(owner, plate, count) VALUES (?, ?, ?)", {pedid, plate, keycounter}, function(rowsChange) + if rowsChange then + TriggerClientEvent('mh_jobgarage:notify', _source, "Schlüsselkasten", "Du hast "..keycounter.."x Schlüssel bekommen.", "success") + end + end) + end + end) + end + MySQL.query("UPDATE player_vehicles SET citizenid = ? WHERE plate = ?", {pedid, plate}) MySQL.query("DELETE FROM mh_jobgarage WHERE plate = ?", {plate})