Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

ReallifeGamemode.Server/Events/Key.cs

@@ -116,6 +116,7 @@ namespace ReallifeGamemode.Server.Events
       using var dbContext = new DatabaseContext();
       User u = player.GetUser(dbContext);
       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
       {
@@ -607,6 +608,8 @@ namespace ReallifeGamemode.Server.Events
     public void KeyPressI(Player player)
     {
       if (!player.IsLoggedIn()) return;
+      if (player.GetData<bool>("isDead")) return;
+
       player.TriggerEvent("inventoryShow");
       InventoryManager.SetBackpackItems(player);
     }
@@ -681,6 +684,7 @@ namespace ReallifeGamemode.Server.Events
     public void KeyPressO(Player player)
     {
       if (!player.IsLoggedIn()) return;
+
       List<Player> players = NAPI.Pools.GetAllPlayers().Where(p => p.IsLoggedIn() == true).OrderBy(o => o.Handle.Value).ToList();
 
       var listPlayers = players.Select(p => new

ReallifeGamemode.Server/Managers/InteractionManager.cs

@@ -809,6 +809,12 @@ namespace ReallifeGamemode.Server.Managers
     [RemoteEvent("CLIENT:InteractionMenu_CallService_Sani")]
     public void CallServiceSani(Player player)
     {
+      if (player.GetUser().FactionId == 2)
+      {
+        player.SendNotification("~r~[Fehler] ~w~Du kannst keinen Sanitäter rufen.");
+        return;
+      }
+
       //MEDIC AUFTRAG
       MedicTask healTask = new MedicTask()
       {