From 1a97d0aa3c26e466334b269c025de5c824c25e89 Mon Sep 17 00:00:00 2001
From: VegaZ <manuel.lampe@hotmail.de>
Date: Fri, 9 Apr 2021 20:14:37 +0200
Subject: [PATCH] Fix Duty-Medics / In Gangwar - TSupport wird kein Revive
 Auftrag erstellt

---
 ReallifeGamemode.Client/Gui/deathscreen.ts      | 3 ++-
 ReallifeGamemode.Server/Events/Death.cs         | 2 +-
 ReallifeGamemode.Server/Events/Key.cs           | 4 ++--
 ReallifeGamemode.Server/Factions/Medic/Medic.cs | 7 ++++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ReallifeGamemode.Client/Gui/deathscreen.ts b/ReallifeGamemode.Client/Gui/deathscreen.ts
index 375f989a..8374bd18 100644
--- a/ReallifeGamemode.Client/Gui/deathscreen.ts
+++ b/ReallifeGamemode.Client/Gui/deathscreen.ts
@@ -36,7 +36,8 @@ export default function deathScreen() {
             deathDate = new Date();
             respawnTime = Math.floor(deathDate.getTime() / 1000 + maxDeathTime);
             fade = 255 - maxDeathTime;
-            mp.game.graphics.requestStreamedTextureDict("Mptattoos", true);
+            mp.game.graphics.requestStreamedTextureDict("Mptattoos", true);          
+            mp.events.call("GetDutyMedics");
             taskTimeout = false;
         }
     });
diff --git a/ReallifeGamemode.Server/Events/Death.cs b/ReallifeGamemode.Server/Events/Death.cs
index 3d8993d1..faeeb590 100644
--- a/ReallifeGamemode.Server/Events/Death.cs
+++ b/ReallifeGamemode.Server/Events/Death.cs
@@ -97,7 +97,7 @@ namespace ReallifeGamemode.Server.Events
 
         user.Dead = true;
 
-        if (!player.HasData("reviveSperre"))
+        if (!player.HasData("reviveSperre") || !player.HasData("inGangWar") || player.GetData<bool>("SAdminduty") == true)
         {
           //MEDIC AUFTRAG
           MedicTask reviveTask = new MedicTask()
diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs
index 70012ea6..cbc7f76c 100644
--- a/ReallifeGamemode.Server/Events/Key.cs
+++ b/ReallifeGamemode.Server/Events/Key.cs
@@ -300,7 +300,7 @@ namespace ReallifeGamemode.Server.Events
             player.TriggerEvent("toggleDutyMode", true);
             if (player.GetUser().FactionId == 2) //Fire Department
             {
-              Medic.UpdateDutyMedics(1);
+              Medic.UpdateDutyMedics();
             }
             switch (factionId)
             {
@@ -338,7 +338,7 @@ namespace ReallifeGamemode.Server.Events
             user.SetData("duty", false);
             player.SendNotification("Du bist nun ~r~außer Dienst.");
             player.TriggerEvent("toggleDutyMode", false);
-            Medic.UpdateDutyMedics(-1);
+            Medic.UpdateDutyMedics();
             UpdateCharacterCloth.LoadCharacterDefaults(player);
           }
           user.SetBlipAndNametagColor();
diff --git a/ReallifeGamemode.Server/Factions/Medic/Medic.cs b/ReallifeGamemode.Server/Factions/Medic/Medic.cs
index 98dda68e..3d060783 100644
--- a/ReallifeGamemode.Server/Factions/Medic/Medic.cs
+++ b/ReallifeGamemode.Server/Factions/Medic/Medic.cs
@@ -288,10 +288,11 @@ namespace ReallifeGamemode.Server.Factions.Medic
         RemoveTaskFromList(task);
       }
     }
-
-    public static void UpdateDutyMedics(int modifier)
+    [RemoteEvent("GetDutyMedics")]
+    public static void UpdateDutyMedics()
     {
-      dutyMedics = dutyMedics + modifier;
+
+      dutyMedics = NAPI.Pools.GetAllPlayers().Where(c => c.GetData<bool>("duty") == true && c.GetUser().FactionId == 2).ToList().Count;
       NAPI.ClientEvent.TriggerClientEventForAll("updateDutyMedics", dutyMedics);
     }
   }