Fix inventory

This commit is contained in:
hydrant
2019-07-28 21:45:55 +02:00
parent fa88ee517e
commit 02fbb9544a

View File

@@ -1,7 +1,7 @@
 
export default function inventory(globalData: GlobalData): void { export default function inventory(globalData: GlobalData): void {
var invBrowser: BrowserMp = null; var invBrowser: BrowserMp = null;
var itemIdArr; var itemIdArr;
@@ -33,8 +33,8 @@ export default function inventory(globalData: GlobalData): void {
invBrowser = null; invBrowser = null;
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
return; return;
} }
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
invBrowser = mp.browsers.new("package://assets/html/inventory/index.html"); invBrowser = mp.browsers.new("package://assets/html/inventory/index.html");
@@ -49,16 +49,16 @@ export default function inventory(globalData: GlobalData): void {
mp.events.add("CEF:BrowserLoadedTrade", () => { mp.events.add("CEF:BrowserLoadedTrade", () => {
invBrowser.execute(`setItems("${JSON.stringify(itemIdArr)}","${JSON.stringify(itemAmountArr)}","${JSON.stringify(money)}");`); invBrowser.execute(`setItems("${JSON.stringify(itemIdArr)}","${JSON.stringify(itemAmountArr)}","${JSON.stringify(money)}");`);
}); });
mp.events.add("CEF:acceptTrade", () => { mp.events.add("CEF:acceptTrade", () => {
mp.events.callRemote('acceptTrade'); mp.events.callRemote('acceptTrade');
invBrowser.destroy() invBrowser.destroy()
invBrowser = null; invBrowser = null;
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
}); });
mp.events.add("CEF:declineTrade", () => { mp.events.add("CEF:declineTrade", () => {
mp.events.callRemote('declineTrade'); mp.events.callRemote('declineTrade');
invBrowser.destroy() invBrowser.destroy()
invBrowser = null; invBrowser = null;
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
@@ -69,10 +69,12 @@ export default function inventory(globalData: GlobalData): void {
}); });
mp.events.add("CEF:tradeItem", (money, User, tradeItems, tradeItemAmount) => { mp.events.add("CEF:tradeItem", (money, User, tradeItems, tradeItemAmount) => {
mp.events.callRemote('tradeItem', money, User, tradeItems, tradeItemAmount); if (invBrowser !== null) {
invBrowser.destroy() mp.events.callRemote('tradeItem', money, User, tradeItems, tradeItemAmount);
invBrowser = null; invBrowser.destroy()
mp.gui.cursor.show(false, false); invBrowser = null;
mp.gui.cursor.show(false, false);
}
}); });
} }