aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable some interactions while player is in vehicle or dead.

Browse Source 
Change keybind mapping from X to Z due to interference with game functions.
This commit is contained in:
Lukas Moungos
2021-05-02 06:15:50 +02:00
parent 81c82f215a
commit 6d675018dc
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ReallifeGamemode.Client/Player/keys.ts
View File

@@ -122,10 +122,10 @@ export default function keys(globalData: IGlobalData) {
} }
}); });
//X // Fahrzeug Verwaltung - Menü //Z // Fahrzeug Verwaltung - Menü
mp.keys.bind(0x58, false, function () { KeyBinder.bind(0x5A, false, function () {
if (!globalData.InChat && !globalData.InMenu && !globalData.InTuning) { if (!globalData.InChat && !globalData.InMenu && !globalData.InTuning) {
mp.events.callRemote("keyPress:X"); mp.events.callRemote("keyPress:Z");
} }
}); });

5
ReallifeGamemode.Server/Events/Key.cs
View File

@@ -116,7 +116,7 @@ namespace ReallifeGamemode.Server.Events
[RemoteEvent("keyPress:M")] [RemoteEvent("keyPress:M")]
public void KeyPressM(Player player) public void KeyPressM(Player player)
{ {
if (!player.IsLoggedIn() || player.GetData<bool>("isDead")) return; if (!player.IsLoggedIn()) return;
using var dbContext = new DatabaseContext(); using var dbContext = new DatabaseContext();
User u = player.GetUser(dbContext); User u = player.GetUser(dbContext);
if (u == null) return; if (u == null) return;
@@ -607,7 +607,6 @@ namespace ReallifeGamemode.Server.Events
player.TriggerEvent("inventoryShow"); player.TriggerEvent("inventoryShow");
InventoryManager.SetBackpackItems(player); InventoryManager.SetBackpackItems(player);
} }
[RemoteEvent("keyPress:J")] [RemoteEvent("keyPress:J")]
@@ -867,7 +866,7 @@ namespace ReallifeGamemode.Server.Events
VehicleStreaming.SetEngineState(v, !state); VehicleStreaming.SetEngineState(v, !state);
} }
[RemoteEvent("keyPress:X")] [RemoteEvent("keyPress:Z")]
public void KeyPressX(Player player) public void KeyPressX(Player player)
{ {
if (!player.IsLoggedIn() || player.GetData<bool>("isDead")) return; if (!player.IsLoggedIn() || player.GetData<bool>("isDead")) return;