From 43f2b912f4559bf0add87595edfd66a4e3578dd3 Mon Sep 17 00:00:00 2001
From: VegaZ <manuel.lampe@hotmail.de>
Date: Mon, 5 Apr 2021 17:34:21 +0200
Subject: [PATCH 1/3] testen Medic

---
 ReallifeGamemode.Server/Events/Key.cs           | 4 ++--
 ReallifeGamemode.Server/Factions/Medic/Medic.cs | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs
index 2591ed2a..503dfc5e 100644
--- a/ReallifeGamemode.Server/Events/Key.cs
+++ b/ReallifeGamemode.Server/Events/Key.cs
@@ -765,9 +765,9 @@ namespace ReallifeGamemode.Server.Events
       if (!player.IsLoggedIn()) return;
 
       if (player.GetData<bool>("healDecision") == true)
-      {
-        player.SetData<bool>("healDecision", false);
+      {      
         Medic.MakeHealDecision(player, false);
+        player.SetData<bool>("healDecision", false);
       }
 
       if (!player.IsInVehicle) return;
diff --git a/ReallifeGamemode.Server/Factions/Medic/Medic.cs b/ReallifeGamemode.Server/Factions/Medic/Medic.cs
index c296676f..fad61601 100644
--- a/ReallifeGamemode.Server/Factions/Medic/Medic.cs
+++ b/ReallifeGamemode.Server/Factions/Medic/Medic.cs
@@ -87,11 +87,13 @@ namespace ReallifeGamemode.Server.Factions.Medic
       if(decision == false)
       {
         activeDecision.dMedic.SendNotification(activeDecision.dTarget.Name + " hat den Heal ~r~abgelehnt",false);
+        activeDecision.dTarget.SendNotification("Du hast den Heal ~r~abgelehnt", false);
         return;
       }
       else
       {
         activeDecision.dMedic.SendNotification(activeDecision.dTarget.Name + " hat den Heal ~g~akzeptiert", false);
+        activeDecision.dTarget.SendNotification("Du hast den Heal ~g~akzeptiert", false);
         using var dbContext = new DatabaseContext();
         {
           User targetUser = target.GetUser(dbContext);

From 01541557b2e940e239dc56d67019aac620dea133 Mon Sep 17 00:00:00 2001
From: VegaZ <manuel.lampe@hotmail.de>
Date: Mon, 5 Apr 2021 17:44:56 +0200
Subject: [PATCH 2/3] ReviveSperre

---
 .../Commands/FactionCommands.cs                |  1 +
 .../Factions/Medic/Medic.cs                    | 18 ++++++++++++++++++
 ReallifeGamemode.Server/Util/ThreadTimers.cs   |  1 +
 3 files changed, 20 insertions(+)

diff --git a/ReallifeGamemode.Server/Commands/FactionCommands.cs b/ReallifeGamemode.Server/Commands/FactionCommands.cs
index 437b8dae..d5a42793 100644
--- a/ReallifeGamemode.Server/Commands/FactionCommands.cs
+++ b/ReallifeGamemode.Server/Commands/FactionCommands.cs
@@ -331,6 +331,7 @@ namespace ReallifeGamemode.Server.Commands
         deadPlayer.SendNotification($"Du wurdest von ~y~{player.Name}~s~ für ~g~{100.ToMoneyString()} ~s~wiederbelebt.");
         player.SendNotification($"Du hast ~y~{deadPlayer.Name}~s~ wiederbelebt und ~g~{Medic.ReviveIncome}$ ~s~für die Fraktion verdient.");
         deadPlayer.SetData("isDead", false);
+        deadPlayer.SetData("reviveSperre", 5);
 
         dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == 2).First().BankAccount.Balance += Medic.ReviveIncome;
 
diff --git a/ReallifeGamemode.Server/Factions/Medic/Medic.cs b/ReallifeGamemode.Server/Factions/Medic/Medic.cs
index fad61601..73639b61 100644
--- a/ReallifeGamemode.Server/Factions/Medic/Medic.cs
+++ b/ReallifeGamemode.Server/Factions/Medic/Medic.cs
@@ -81,6 +81,24 @@ namespace ReallifeGamemode.Server.Factions.Medic
       }
     }
 
+    public static void UpdateReviveSperre()
+    {
+      var allRevivedPlayers = NAPI.Pools.GetAllPlayers().Where(c => c.HasData("reviveSperre"));
+      foreach(var player in allRevivedPlayers)
+      {
+        var timeLeft = player.GetData<int>("reviveSperre");
+
+        if (timeLeft > 0)
+        {
+          player.SetData("reviveSperre", timeLeft - 1);
+        }
+        else
+        {
+          player.ResetData("reviveSperre");
+        }
+      }
+    }
+
     public static void MakeHealDecision(Player target, bool decision)
     {
       var activeDecision = HealDecisions.FirstOrDefault(d => d.dTarget == target);
diff --git a/ReallifeGamemode.Server/Util/ThreadTimers.cs b/ReallifeGamemode.Server/Util/ThreadTimers.cs
index 92b16424..0f96f89a 100644
--- a/ReallifeGamemode.Server/Util/ThreadTimers.cs
+++ b/ReallifeGamemode.Server/Util/ThreadTimers.cs
@@ -59,6 +59,7 @@ namespace ReallifeGamemode.Server.Util
         Jail.JailOut_Elapsed();
         Economy.Timer_Elapsed();
         WeaponDealManager.Timer_Elapsed();
+        Medic.UpdateReviveSperre();
       });
     }
 

From e02a6b6af7400e9c7c979014f5f67b6fca0cafb7 Mon Sep 17 00:00:00 2001
From: VegaZ <manuel.lampe@hotmail.de>
Date: Mon, 5 Apr 2021 17:46:39 +0200
Subject: [PATCH 3/3] Fix healdec

---
 ReallifeGamemode.Server/Events/Key.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs
index 503dfc5e..9781dbaa 100644
--- a/ReallifeGamemode.Server/Events/Key.cs
+++ b/ReallifeGamemode.Server/Events/Key.cs
@@ -616,9 +616,9 @@ namespace ReallifeGamemode.Server.Events
     {
       if (!player.IsLoggedIn()) return;
       if (player.GetData<bool>("healDecision") == true)
-      {
-        player.SetData<bool>("healDecision", false);
+      {       
         Medic.MakeHealDecision(player, true);
+        player.SetData<bool>("healDecision", false);
       }
 
       User u = player.GetUser();