diff --git a/ReallifeGamemode.Server/Services/ChatService.cs b/ReallifeGamemode.Server/Services/ChatService.cs index e83e708d..324920cb 100644 --- a/ReallifeGamemode.Server/Services/ChatService.cs +++ b/ReallifeGamemode.Server/Services/ChatService.cs @@ -76,6 +76,18 @@ namespace ReallifeGamemode.Server.Services /// /// Die Nachricht, die gesendet werden soll /// Das mindest Admin Level, das für das Erhalten dieser Nachricht benötigt wird + public static void HQMessage(string message) + { + foreach (var copPlayer in NAPI.Pools.GetAllPlayers()) + { + User copUser = copPlayer.GetUser(); + if ((copUser.FactionId == 1 || copUser.FactionId == 3)) + { + ChatService.SendMessage(copPlayer, "!{#8181E9}HQ: " + message); + } + } + } + public static void BroadcastAdmin(string message, AdminLevel minLevel) { NAPI.Pools.GetAllPlayers().ForEach(p => diff --git a/ReallifeGamemode.Server/Wanted/Jail.cs b/ReallifeGamemode.Server/Wanted/Jail.cs index dcaab289..9bf1e7e5 100644 --- a/ReallifeGamemode.Server/Wanted/Jail.cs +++ b/ReallifeGamemode.Server/Wanted/Jail.cs @@ -245,15 +245,8 @@ namespace ReallifeGamemode.Server.Wanted } target.Health = 100; target.Position = new Vector3(461.7256, -988.6035, 24.91487); - foreach (var copPlayer in NAPI.Pools.GetAllPlayers()) - { - User copUser = copPlayer.GetUser(); - if ((copUser.FactionId == 1 || copUser.FactionId == 3)) - { - target.TriggerEvent("jailTime", 0); - ChatService.SendMessage(copPlayer, "!{#8181E9}HQ: Admin " + admin.Name + " hat " + user.Name + " aus dem Knast entlassen."); - } - } + + ChatService.HQMessage("Admin " + admin.Name + " hat " + user.Name + " aus dem Knast entlassen."); ChatService.SendMessage(target, "Admin " + admin.Name + " hat dich aus dem Knast entlassen"); ChatService.SendMessage(admin, "Du hast " + user.Name + " administrativ aus dem Knast entlassen"); }