From 8169ba60f8b703ab5920e5d5da52f1b5c5d98d9d Mon Sep 17 00:00:00 2001
From: VegaZ <manuel.lampe@hotmail.de>
Date: Sat, 6 Feb 2021 20:35:54 +0100
Subject: [PATCH] =?UTF-8?q?Weitere=20Fehler=20behoben,=20DEBUG=20hinzugef?=
 =?UTF-8?q?=C3=BCgt,=20pls=20TEST?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ReallifeGamemode.Client/Gui/deathscreen.ts      | 17 +++++++++++------
 .../Interaction/factioninteraction.ts           |  5 ++++-
 ReallifeGamemode.Server/Factions/Medic/Medic.cs |  3 ++-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/ReallifeGamemode.Client/Gui/deathscreen.ts b/ReallifeGamemode.Client/Gui/deathscreen.ts
index 57537db8..3868945a 100644
--- a/ReallifeGamemode.Client/Gui/deathscreen.ts
+++ b/ReallifeGamemode.Client/Gui/deathscreen.ts
@@ -17,7 +17,7 @@ export default function deathScreen() {
     var deathSeconds;
     var fade;
     var deathDate: Date;
-
+    var taskTimeout = false;
     const maxDeathTime = 30;
     const medicJobTime = maxDeathTime * 2;
 
@@ -37,6 +37,7 @@ export default function deathScreen() {
             respawnTime = Math.floor(deathDate.getTime() / 1000 + maxDeathTime);
             fade = 255 - maxDeathTime;
             mp.game.graphics.requestStreamedTextureDict("Mptattoos", true);
+            taskTimeout = false;
         }
     });
 
@@ -53,13 +54,19 @@ export default function deathScreen() {
         mp.game.gameplay.setFadeOutAfterDeath(false);
         mp.events.callRemote('RespawnPlayerAtHospital');
         mp.game.graphics.setStreamedTextureDictAsNoLongerNeeded("Mptattoos");
+        mp.events.callRemote("CutMedicEarnings");
     });
 
     mp.events.add("updateDutyMedics", (count) => {
         dutyMedics = count;
     });
 
+    mp.events.add("medicTaskTimeout", (count) => {
+        taskTimeout = true;
+        mp.events.callRemote("MedicTaskTimeout");
+        mp.events.callRemote("RemoveMedicCheckpoint");
 
+    });
 
     mp.events.add("render", () => {
         var currentDate = new Date();
@@ -104,13 +111,11 @@ export default function deathScreen() {
                 mp.game.graphics.drawRect(0.5, 0.5, 1, 1, 0, 0, 0, alpha);
 
             } else {
-                mp.events.call("respawnDeathPlayer");
-                mp.events.callRemote("CutMedicEarnings");
+                mp.events.call("respawnDeathPlayer");               
             }
         } else {
-            if (deathSeconds > medicJobTime) {
-                mp.events.callRemote("MedicTaskTimeout");
-                mp.events.callRemote("RemoveMedicCheckpoint");
+            if (deathSeconds > medicJobTime && taskTimeout == false) {            
+                mp.events.callRemote("medicTaskTimeout");               
             }
         }
     });
diff --git a/ReallifeGamemode.Client/Interaction/factioninteraction.ts b/ReallifeGamemode.Client/Interaction/factioninteraction.ts
index e1620a70..ed477a4e 100644
--- a/ReallifeGamemode.Client/Interaction/factioninteraction.ts
+++ b/ReallifeGamemode.Client/Interaction/factioninteraction.ts
@@ -477,15 +477,18 @@ export default function factionInteraction(globalData: IGlobalData) {
     });
 
     mp.events.add('playerEnterCheckpoint', (activeCheckpoint) => {
+        mp.gui.chat.push("DEBUG: Checkpoint NACH wiederbelebung des Spielers betreten")
         if (deadRespawned == true) {
             activeTask = false;
             activeCheckpoint.destroy();
             mp.events.callRemote("delReviveTask");
-            mp.events.callRemote("payCutMedicEarnings");
+            mp.events.callRemote("PayCutMedicEarnings");
+            mp.gui.chat.push("DEBUG: Hälfte ausgezahlt")
             deadRespawned = false;
         } else {
             activeTask = false;
             activeCheckpoint.destroy();
+            mp.gui.chat.push("DEBUG: Checkpoint VOR wiederbelebung des Spielers betreten")
         }
     });
 
diff --git a/ReallifeGamemode.Server/Factions/Medic/Medic.cs b/ReallifeGamemode.Server/Factions/Medic/Medic.cs
index c0053043..fc8beeb3 100644
--- a/ReallifeGamemode.Server/Factions/Medic/Medic.cs
+++ b/ReallifeGamemode.Server/Factions/Medic/Medic.cs
@@ -144,8 +144,9 @@ namespace ReallifeGamemode.Server.Factions.Medic
       MedicTask task = ReviveTasks.FirstOrDefault(t => t.Victim == player.Name);
       var medic = PlayerService.GetPlayerByNameOrId(task.MedicName);
       medic.TriggerEvent("cutMedicEarnings");
+      medic.SendChatMessage("DEBUG: Der Spieler wurde respawnt. Nur noch 50% des Verdienst");
     }
-    [RemoteEvent("payCutMedicEarnings")]
+    [RemoteEvent("PayCutMedicEarnings")]
     public void PayCutMedicEarnings(Player player)
     {
         using var dbContext = new DatabaseContext();