From 7bcc72e3cf86c6747b45b264edf30b9c8dedf3f8 Mon Sep 17 00:00:00 2001 From: hydrant Date: Sun, 8 Sep 2019 14:16:04 +0200 Subject: [PATCH] improve hqmessage --- ReallifeGamemode.Server/Commands/AdminCommands.cs | 2 +- ReallifeGamemode.Server/Services/ChatService.cs | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index ebcad395..8fb7b55d 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -394,7 +394,7 @@ namespace ReallifeGamemode.Server.Commands return; } - ReallifeGamemode.Server.Wanted.Jail.Release_Jail_Admin(player, target); + Jail.Release_Jail_Admin(player, target); } [Command("a", "~m~Benutzung: ~s~/a [Nachricht]", GreedyArg = true)] diff --git a/ReallifeGamemode.Server/Services/ChatService.cs b/ReallifeGamemode.Server/Services/ChatService.cs index 324920cb..022cf92c 100644 --- a/ReallifeGamemode.Server/Services/ChatService.cs +++ b/ReallifeGamemode.Server/Services/ChatService.cs @@ -78,14 +78,7 @@ namespace ReallifeGamemode.Server.Services /// 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); - } - } + BroadcastFaction("!{#8181E9}HQ: " + message, new List() { 1, 3 }); } public static void BroadcastAdmin(string message, AdminLevel minLevel) @@ -127,7 +120,7 @@ namespace ReallifeGamemode.Server.Services internal static void BroadcastFaction(string message, List factionIds) { - using(var dbContext = new DatabaseContext()) + using (var dbContext = new DatabaseContext()) { BroadcastFaction(message, dbContext.Factions.Where(f => factionIds.Contains(f.Id)).ToList()); }