diff --git a/ReallifeGamemode.Client/Gui/Inventory/inventory.ts b/ReallifeGamemode.Client/Gui/Inventory/inventory.ts index 1da8e792..57c73896 100644 --- a/ReallifeGamemode.Client/Gui/Inventory/inventory.ts +++ b/ReallifeGamemode.Client/Gui/Inventory/inventory.ts @@ -129,16 +129,16 @@ export default function inventory() { } }); + //HANDEL akzeptiert. mp.events.add("clearTradeItems", () => { tradeConfirm = false; tradeItems.splice(0, tradeItems.length); + tradePartner = "Keinem"; tradePrize = 0; }); - mp.events.add("unlockTradeItems", () => { - tradeConfirm = false; - }); + //HANDEL akzeptiert. mp.events.add("showTradeItems", (tradeResultItemArray) => { //for (var i = 0; i < tradeResultItemArray.length; i++) { @@ -146,6 +146,12 @@ export default function inventory() { //} tradeItems = JSON.parse(tradeResultItemArray); isTrading = true; + + }); + + //HANDEL Abgebrochen + mp.events.add("unlockTradeItems", () => { + tradeConfirm = false; }); mp.events.add("removeItem", (userItemId, amount) => { diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 53b67773..f0cee7cf 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -44,7 +44,6 @@ namespace ReallifeGamemode.Server.Events "0", "200", true.ToString(), 0.ToString(), 0.ToString()); player.SendNotification("~y~ATM~s~ erstellt!", false); break; - } }