From 2d885653dcb4a989e9714b80a7950c48f7a95afe Mon Sep 17 00:00:00 2001 From: hydrant Date: Tue, 30 Jul 2019 13:43:03 +0200 Subject: [PATCH] fix house menu --- ReallifeGamemode.Client/Gui/house.ts | 1 + ReallifeGamemode.Server/Managers/HouseManager.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ReallifeGamemode.Client/Gui/house.ts b/ReallifeGamemode.Client/Gui/house.ts index ada21d01..bb50a9f4 100644 --- a/ReallifeGamemode.Client/Gui/house.ts +++ b/ReallifeGamemode.Client/Gui/house.ts @@ -25,6 +25,7 @@ export default function house(globalData: GlobalData) { }); function keyPressHandler() { + if (globalData.InMenu || globalData.InChat || globalData.InInput || !globalData.LoggedIn) return; mp.game.ui.clearHelp(true); var subTitle = houseData.Type; diff --git a/ReallifeGamemode.Server/Managers/HouseManager.cs b/ReallifeGamemode.Server/Managers/HouseManager.cs index d93046eb..10c25393 100644 --- a/ReallifeGamemode.Server/Managers/HouseManager.cs +++ b/ReallifeGamemode.Server/Managers/HouseManager.cs @@ -120,7 +120,7 @@ namespace ReallifeGamemode.Server.Managers private static void HouseManager_OnEntityEnterColShape(ColShape colShape, Client client) { - if (!client.IsLoggedIn()) return; + if (!client.IsLoggedIn() || client.IsInVehicle) return; if (!houseColShapes.ContainsValue(colShape.Handle)) { return;