From 18cdc73e83b55e261f44d455b87f4e6e9ee987e9 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 11 Sep 2020 14:56:04 +0200 Subject: [PATCH] ... --- ReallifeGamemode.Server/Events/Death.cs | 9 --------- ReallifeGamemode.Server/Wanted/Jail.cs | 6 ++++-- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/ReallifeGamemode.Server/Events/Death.cs b/ReallifeGamemode.Server/Events/Death.cs index d93799e9..bc3e8c50 100644 --- a/ReallifeGamemode.Server/Events/Death.cs +++ b/ReallifeGamemode.Server/Events/Death.cs @@ -95,15 +95,6 @@ namespace ReallifeGamemode.Server.Events Medic.AddTaskToList(reviveTask); ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " ist soeben verstorben.", new List() { 2 }); - if (user.Wanteds <= 0 && user.JailTime > 0) - { - return; - } - else - { - ChatService.BroadcastFaction("!{#8181E9}HQ: Der Verdächtigte " + user.Name + " wurde soeben ins Krankenhaus eingeliefert.", new System.Collections.Generic.List() { 1, 3 }); - } - if (player.GetUser().IsAdmin(AdminLevel.ADMIN) == true) { player.TriggerEvent("startDeathTimer", true); diff --git a/ReallifeGamemode.Server/Wanted/Jail.cs b/ReallifeGamemode.Server/Wanted/Jail.cs index 3140b0f8..5a08c80e 100644 --- a/ReallifeGamemode.Server/Wanted/Jail.cs +++ b/ReallifeGamemode.Server/Wanted/Jail.cs @@ -122,9 +122,11 @@ namespace ReallifeGamemode.Server.Wanted ChatService.BroadcastFaction("!{#8181E9}HQ: " + user.Name + " wurde ins Gefängnis geliefert.", new List() { 1, 3 }); } } - } + else if (user.Wanteds <= 0 && user.JailTime > 0) { + ChatService.BroadcastFaction("!{#8181E9}HQ: Der Verdächtigte " + user.Name + " wurde soeben ins Krankenhaus eingeliefert.", new System.Collections.Generic.List() { 1, 3 }); + } + } } - dbContext.SaveChanges(); } }