diff --git a/ReallifeGamemode.Client/Interaction/factioninteraction.ts b/ReallifeGamemode.Client/Interaction/factioninteraction.ts index 0adb2c76..9eb5f6c1 100644 --- a/ReallifeGamemode.Client/Interaction/factioninteraction.ts +++ b/ReallifeGamemode.Client/Interaction/factioninteraction.ts @@ -481,7 +481,7 @@ export default function factionInteraction(globalData: IGlobalData) { if (deadRespawned == true) { activeTask = false; activeCheckpoint.destroy(); - mp.events.callRemote("delReviveTask"); + mp.events.callRemote("delReviveTaskMedic"); mp.events.callRemote("PayCutMedicEarnings"); mp.gui.chat.push("DEBUG: Hälfte ausgezahlt") deadRespawned = false; diff --git a/ReallifeGamemode.Server/Events/Death.cs b/ReallifeGamemode.Server/Events/Death.cs index 81d497b8..4cbf795c 100644 --- a/ReallifeGamemode.Server/Events/Death.cs +++ b/ReallifeGamemode.Server/Events/Death.cs @@ -232,7 +232,7 @@ namespace ReallifeGamemode.Server.Events dbContext.SaveChanges(); } player.RemoveAllWeapons(); - Medic.delReviveTask(player); + //Medic.delReviveTask(player); NAPI.Player.SpawnPlayer(player, new Vector3(-495.45, -336.33, 34.5), -98.36f); } } diff --git a/ReallifeGamemode.Server/Factions/Medic/Medic.cs b/ReallifeGamemode.Server/Factions/Medic/Medic.cs index 9d768cbf..83151074 100644 --- a/ReallifeGamemode.Server/Factions/Medic/Medic.cs +++ b/ReallifeGamemode.Server/Factions/Medic/Medic.cs @@ -129,6 +129,12 @@ namespace ReallifeGamemode.Server.Factions.Medic MedicTask task = ReviveTasks.FirstOrDefault(t => t.Victim == player.Name); RemoveTaskFromList(task); } + [RemoteEvent("delReviveTaskMedic")] + public static void delReviveTaskMedic(Player player) + { + MedicTask task = ReviveTasks.FirstOrDefault(t => t.MedicName == player.Name); + RemoveTaskFromList(task); + } [RemoteEvent("RemoveMedicCheckpoint")] public void RemoveMedicCheckpoint(Player player)