diff --git a/ReallifeGamemode.Server/Events/Death.cs b/ReallifeGamemode.Server/Events/Death.cs index 16567deb..bc3e8c50 100644 --- a/ReallifeGamemode.Server/Events/Death.cs +++ b/ReallifeGamemode.Server/Events/Death.cs @@ -77,6 +77,7 @@ namespace ReallifeGamemode.Server.Events } User user = player.GetUser(); + if (user.JailTime <= 0) { //MEDIC AUFTRAG @@ -92,6 +93,7 @@ namespace ReallifeGamemode.Server.Events MedicName = "none" }; Medic.AddTaskToList(reviveTask); + ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " ist soeben verstorben.", new List() { 2 }); if (player.GetUser().IsAdmin(AdminLevel.ADMIN) == true) { diff --git a/ReallifeGamemode.Server/Factions/Medic/Medic.cs b/ReallifeGamemode.Server/Factions/Medic/Medic.cs index 3dd8a1ff..70f74fb4 100644 --- a/ReallifeGamemode.Server/Factions/Medic/Medic.cs +++ b/ReallifeGamemode.Server/Factions/Medic/Medic.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using GTANetworkAPI; using Newtonsoft.Json; +using ReallifeGamemode.Server.Services; /** * @overview Life of German Reallife - Server Factions Medic Medic.cs @@ -84,10 +85,13 @@ namespace ReallifeGamemode.Server.Factions.Medic [RemoteEvent("updateMedicTask")] public void UpdateMedicTasks(Player player, int type, int index, string medicName) { + + switch (type) { case 0: ReviveTasks[index].MedicName = medicName; + ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + "hat den Reviveauftrag von " + medicName + " angenommen.", new List() { 2 }); break; case 1: