From 111a508b91f90ebe7e72e2aee9714a1a4aaadd8a Mon Sep 17 00:00:00 2001 From: Luke Date: Fri, 7 May 2021 16:32:34 +0200 Subject: [PATCH] =?UTF-8?q?chat-nachrichten=20vereinheitlicht/aufger=C3=A4?= =?UTF-8?q?umt/...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit /pm, /skick, /kick, /warn, /ip, /ban und /unban --- .../Commands/AdminCommands.cs | 22 +++++++++---------- .../Extensions/ClientExtension.cs | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index 572fc49f..45398cc3 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -476,11 +476,11 @@ namespace ReallifeGamemode.Server.Commands msg = Regex.Replace(msg, "(~[a-zA-Z]~)|(!{(.*)})", ""); ChatService.SendMessage(player, "~y~PM an " + target.Name + ": " + msg + " "); - string Message = "~y~PM von " + player.GetUser().AdminLevel.GetName() + " " + player.Name + ": " + msg + ""; + string Message = "~y~PM von " + player.GetUser().AdminLevel.GetName() + " " + player.Name + ": " + msg; ChatService.SendMessage(target, Message); } - [Command("skick", "~m~Benutzung: ~s~/skick [Player] [Grund]", GreedyArg = true)] + [Command("skick", "~m~Benutzung: ~s~/skick [Spieler] [Grund]", GreedyArg = true)] public void CmdAdminSKick(Player player, string targetname, string reason) { if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) @@ -503,14 +503,14 @@ namespace ReallifeGamemode.Server.Commands } string adminPlayername = NAPI.Player.GetPlayerName(player); - ChatService.SendMessage(target, "~r~KICKINFO: ~w~Du wurdest von " + adminPlayername + " vom Server gekickt: " + reason); + ChatService.SendMessage(target, "~r~INFO: ~w~Du wurdest von " + adminPlayername + " vom Server gekickt (Grund: " + reason + ")."); NAPI.Task.Run(() => { target.Kick(); }, 2500); - ChatService.BroadcastAdmin("~y~SKICK: ~w~" + target.Name + " wurde von " + player.GetUser().AdminLevel.GetName() + " " + adminPlayername + " gekickt: " + reason, AdminLevel.SUPPORTER); + ChatService.BroadcastAdmin("~y~SKICK: ~w~" + target.Name + " wurde von " + player.GetUser().AdminLevel.GetName() + " " + adminPlayername + " gekickt (Grund: " + reason + ").", AdminLevel.SUPPORTER); } [Command("clearchat", "~m~Benutzung: ~s~/clearchat")] @@ -853,7 +853,7 @@ namespace ReallifeGamemode.Server.Commands target.Kick(); }, 2500); - ChatService.Broadcast("~r~INFO: ~w~" + target.Name + " wurde von " + player.GetUser().AdminLevel.GetName() + " " + adminPlayername + " gekickt (Grund: " + reason + ")."); + ChatService.Broadcast("!{#FF4040}[KICK] ~w~" + target.Name + " wurde von " + player.GetUser().AdminLevel.GetName() + " " + adminPlayername + " gekickt (Grund: " + reason + ")."); } [Command("warn", "~m~Benutzung: ~s~/warn [Player] [Grund]", GreedyArg = true)] @@ -883,13 +883,13 @@ namespace ReallifeGamemode.Server.Commands dbContext.SaveChanges(); if (userwarn.warn >= 3) { - ChatService.BroadcastAdmin("~y~INFO: Das war der 3. Warn - bitte bannen!", AdminLevel.ADMIN); + ChatService.BroadcastAdmin("~y~INFO: ~w~" + targetPlayername + " hat jetzt drei Warns – bitte bannen!", AdminLevel.ADMIN); } } - ChatService.SendMessage(target, "~r~WARNINFO: ~w~Du wurdest von " + adminPlayername + " verwarnt: " + reason); + ChatService.SendMessage(target, "!{#FF4040}[WARN] ~w~Du wurdest von " + adminPlayername + " verwarnt (Grund: " + reason + ")."); - ChatService.BroadcastAdmin("~y~INFO: ~w~" + targetPlayername + " wurde von " + player.GetUser().AdminLevel.GetName() + " " + adminPlayername + " verwarnt: " + reason, AdminLevel.ADMIN); + ChatService.BroadcastAdmin("~y~INFO: " + targetPlayername + " ~w~wurde von " + player.GetUser().AdminLevel.GetName() + " ~y~" + adminPlayername + " ~w~verwarnt (Grund: " + reason + ").", AdminLevel.ADMIN); } [Command("ip", "~m~Benutzung: ~s~/ip [Spieler]")] @@ -907,7 +907,7 @@ namespace ReallifeGamemode.Server.Commands ChatService.PlayerNotFound(player); return; } - ChatService.SendMessage(player, "IP von ~y~" + NAPI.Player.GetPlayerName(target) + ": ~g~" + target.Address); + ChatService.SendMessage(player, "~y~IP: ~w~Die IP-Adresse von ~y~" + NAPI.Player.GetPlayerName(target) + " ~w~lautet: ~y~" + target.Address); } [Command("ban", "~m~Benutzung: ~s~/ban [User] [Zeit in Minuten (0 = Permanent)] [Grund]", GreedyArg = true)] @@ -942,7 +942,7 @@ namespace ReallifeGamemode.Server.Commands reason = Regex.Replace(reason, "(~[a-zA-Z]~)|(!{(.*)})", ""); string adminPlayername = NAPI.Player.GetPlayerName(admin); - String banMessage = "~r~INFO: ~w~Du wurdest von " + adminPlayername + " vom Server gebannt (Grund: " + reason + ")."; + String banMessage = "~r~INFO: ~w~Du wurdest von " + adminPlayername + " permanent vom Server gebannt (Grund: " + reason + ")."; if (mins > 0) { @@ -1006,7 +1006,7 @@ namespace ReallifeGamemode.Server.Commands user.UnbanPlayer(); } - string message = "~b~[ADMIN] ~s~Der Spieler ~y~" + user.Name + " ~s~wurde von ~y~" + admin.Name + " ~s~entbannt."; + string message = "~y~INFO: ~w~Der Spieler ~y~" + user.Name + " ~w~wurde von ~y~" + admin.Name + " ~w~entbannt."; ChatService.BroadcastAdmin(message, AdminLevel.ADMIN); } diff --git a/ReallifeGamemode.Server/Extensions/ClientExtension.cs b/ReallifeGamemode.Server/Extensions/ClientExtension.cs index 5463e0f6..dcd4d284 100644 --- a/ReallifeGamemode.Server/Extensions/ClientExtension.cs +++ b/ReallifeGamemode.Server/Extensions/ClientExtension.cs @@ -289,7 +289,7 @@ namespace ReallifeGamemode.Server.Extensions if (mins == 0) { - ChatService.Broadcast("!{#FF4040}[BAN] " + user.Name + " wurde von " + admin.Name + " permanent gebannt. [" + reason + "]"); + ChatService.Broadcast("!{#FF4040}[BAN] ~w~" + user.Name + " wurde von " + admin.Name + " permanent gebannt (Grund: " + reason + ")."); banUser = new Ban { UserId = user.Id, Reason = reason, BannedBy = admin.Name, Applied = unixTimestamp, UntilDateTime = unixTimestamp }; user.Player?.Kick(); @@ -298,7 +298,7 @@ namespace ReallifeGamemode.Server.Extensions } else { - ChatService.Broadcast("!{#FF4040}[BAN] " + user.Name + " wurde von " + admin.Name + " für " + mins + " Minuten gebannt. [" + reason + "]"); + ChatService.Broadcast("!{#FF4040}[BAN] ~w~" + user.Name + " wurde von " + admin.Name + " für " + mins + " Minute(n) gebannt (Grund: " + reason + ")."); banUser = new Ban { UserId = user.Id, Reason = reason, BannedBy = admin.Name, Applied = unixTimestamp, UntilDateTime = unixTimestamp + mins * 60 }; user.Player?.Kick(); }