diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index f15ad483..b5522c9f 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -34,7 +34,7 @@ namespace ReallifeGamemode.Server.Events [RemoteEvent("keyPress:NUM2")] public void KeyPressNUM2(Player player) { - if (!player.IsLoggedIn()) return; + if (!player.IsLoggedIn() || player.GetData("isDead")) return; if (player.GetData("editmode") == true && player.GetUser().IsAdmin(AdminLevel.HEADADMIN) == true) { var saveMode = player.GetData("quicksavemode"); @@ -91,7 +91,7 @@ namespace ReallifeGamemode.Server.Events [RemoteEvent("keyPress:RIGHT_ARROW")] public void KeyPressRightArrow(Player player) { - if (!player.IsLoggedIn()) return; + if (!player.IsLoggedIn() || player.GetData("isDead")) return; User user = player.GetUser(); if (!player.IsDuty()) @@ -116,10 +116,10 @@ namespace ReallifeGamemode.Server.Events [RemoteEvent("keyPress:M")] public void KeyPressM(Player player) { + if (!player.IsLoggedIn() || player.GetData("isDead")) return; using var dbContext = new DatabaseContext(); User u = player.GetUser(dbContext); if (u == null) return; - if (player.GetData("isDead")) return; var vehicles = dbContext.UserVehicles.Where(veh => veh.UserId == u.Id).OrderBy(veh => veh.Id).Select(v => new { @@ -135,7 +135,6 @@ namespace ReallifeGamemode.Server.Events Price = f.BuyPrice }); - Paycheck paycheck = null; if (Economy.Paychecks.ContainsKey(u.Id)) paycheck = Economy.Paychecks[u.Id]; @@ -210,7 +209,7 @@ namespace ReallifeGamemode.Server.Events [RemoteEvent("keyPress:E")] public void KeyPressE(Player player) { - if (!player.IsLoggedIn()) return; + if (!player.IsLoggedIn() || player.GetData("isDead") || player.IsInVehicle) return; var user = player.GetUser(); if (player.HasData("nearATM")) @@ -219,12 +218,9 @@ namespace ReallifeGamemode.Server.Events return; } - if (!player.IsInVehicle) + if (GroundItem.PickUpGroundItem(player)) { - if (GroundItem.PickUpGroundItem(player)) - { - return; - } + return; } DutyPoint nearestDuty = PositionManager.DutyPoints.Find(d => d.Position.DistanceTo(player.Position) <= 1.5 && d.FactionId == user.FactionId); @@ -466,9 +462,7 @@ namespace ReallifeGamemode.Server.Events }); } - player.TriggerEvent("showWeaponMenu", primarys.ToArray(), secondarys.ToArray(), melees.ToArray(), specials.ToArray(), armor.ToArray(), JsonConvert.SerializeObject(timer.ToArray()), JsonConvert.SerializeObject(amountInfos)); - } } if (nearestJailReleasePoint != null) @@ -608,17 +602,18 @@ namespace ReallifeGamemode.Server.Events [RemoteEvent("keyPress:I")] public void KeyPressI(Player player) { - if (!player.IsLoggedIn()) return; + if (!player.IsLoggedIn() || player.GetData("isDead")) return; if (player.GetData("isDead")) return; player.TriggerEvent("inventoryShow"); InventoryManager.SetBackpackItems(player); + } [RemoteEvent("keyPress:J")] public void KeyPressJ(Player player) { - if (!player.IsLoggedIn()) return; + if (!player.IsLoggedIn() || player.GetData("isDead")) return; if (player.GetData("healDecision") == true) { player.ResetData("healDecision"); @@ -626,11 +621,11 @@ namespace ReallifeGamemode.Server.Events return; } - if(player.GetData("SellVehicleDecision") == true && player.HasData("VehicleToSell")) + if (player.GetData("SellVehicleDecision") == true && player.HasData("VehicleToSell")) { InteractionManager.SellServerVehicle(player, player.GetData("VehicleToSell")); player.ResetData("SellVehicleDecision"); - player.ResetData("VehicleToSell"); + player.ResetData("VehicleToSell"); return; } @@ -714,7 +709,7 @@ namespace ReallifeGamemode.Server.Events [RemoteEvent("keyPress:K")] public void KeyPressK(Player player) { - if (!player.IsLoggedIn()) return; + if (!player.IsLoggedIn() || player.GetData("isDead")) return; var user = player.GetUser(); if (user == null) { @@ -774,14 +769,14 @@ namespace ReallifeGamemode.Server.Events [RemoteEvent("keyPress:L")] public void KeyPressL(Player player) { - if (!player.IsLoggedIn()) return; + if (!player.IsLoggedIn() || player.GetData("isDead")) return; DoorManager.ChangeDoorState(player); } [RemoteEvent("keyPress:N")] public void KeyPressN(Player player) { - if (!player.IsLoggedIn()) return; + if (!player.IsLoggedIn() || player.GetData("isDead")) return; if (player.GetData("healDecision") == true) { @@ -875,7 +870,7 @@ namespace ReallifeGamemode.Server.Events [RemoteEvent("keyPress:X")] public void KeyPressX(Player player) { - if (!player.IsLoggedIn()) return; + if (!player.IsLoggedIn() || player.GetData("isDead")) return; if (!player.IsInVehicle) {