From f19564266e86af192dc1924592b914573b12f5f9 Mon Sep 17 00:00:00 2001 From: Siga Date: Mon, 3 Feb 2020 18:27:33 +0100 Subject: [PATCH] temp fix for inventory --- ReallifeGamemode.Client/inventory/inventory.ts | 9 +++++---- ReallifeGamemode.Server/Events/Vehicle.cs | 7 +++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ReallifeGamemode.Client/inventory/inventory.ts b/ReallifeGamemode.Client/inventory/inventory.ts index 4fcc42be..fc8e7118 100644 --- a/ReallifeGamemode.Client/inventory/inventory.ts +++ b/ReallifeGamemode.Client/inventory/inventory.ts @@ -23,11 +23,11 @@ export default function inventory(globalData: GlobalData): void { }); var open = false; mp.events.add('inventoryShow', (iWeight, iNameArr, iAmountArr, iIdArr, playersArr) => { - + if (!globalData.InMenu) { + globalData.InMenu = true; if (invBrowser === null) { - if (!globalData.InMenu) { - globalData.InMenu = true; + mp.gui.cursor.show(true, true); invBrowser = mp.browsers.new('package://assets/html/inventory/inventory.html'); Players = playersArr; @@ -35,7 +35,7 @@ export default function inventory(globalData: GlobalData): void { itemAmountArr = iAmountArr; itemNameArr = iNameArr; invWeight = iWeight; - } + } else { try { @@ -49,6 +49,7 @@ export default function inventory(globalData: GlobalData): void { return; } + } }); var offer = 0; diff --git a/ReallifeGamemode.Server/Events/Vehicle.cs b/ReallifeGamemode.Server/Events/Vehicle.cs index d8e6ec9d..44a3fa13 100644 --- a/ReallifeGamemode.Server/Events/Vehicle.cs +++ b/ReallifeGamemode.Server/Events/Vehicle.cs @@ -59,6 +59,13 @@ namespace ReallifeGamemode.Server.Events return; } } + else if (sV is UserVehicle uV) + { + if (uV.UserId != u.Id) + { + return; + } + } } VehicleStreaming.SetEngineState(v, !state); }