Disable some Interactions while player is in vehicle or dead.

Change Keybind X to Z.
This commit is contained in:
2021-05-02 06:13:53 +02:00
parent 7ccb580949
commit 81c82f215a

View File

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