From b04ad523f60249ca7589a10795d14b43550c9f3f Mon Sep 17 00:00:00 2001 From: hydrant Date: Thu, 7 May 2020 19:53:33 +0200 Subject: [PATCH] /setjob nur existierende jobs --- ReallifeGamemode.Server/Commands/AdminCommands.cs | 4 ++-- ReallifeGamemode.Server/Services/ChatService.cs | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index 1e46f6be..c89cf85f 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -1005,9 +1005,9 @@ namespace ReallifeGamemode.Server.Commands ChatService.PlayerNotFound(player); return; } - if (JobID < 0) + if (JobManager.GetJob(JobID) == null) { - ChatService.SendMessage(player, "~r~JobID kann nicht unter 0 sein"); + ChatService.ErrorMessage(player, "Dieser job existiert nicht"); return; } using (var dbContext = new DatabaseContext()) diff --git a/ReallifeGamemode.Server/Services/ChatService.cs b/ReallifeGamemode.Server/Services/ChatService.cs index 73b19aa7..834ce0bf 100644 --- a/ReallifeGamemode.Server/Services/ChatService.cs +++ b/ReallifeGamemode.Server/Services/ChatService.cs @@ -32,6 +32,11 @@ namespace ReallifeGamemode.Server.Services public static void ErrorMessage(Player player, string message) { + if (message.EndsWith(".")) + { + message.Substring(0, message.Length - 1); + } + ChatService.SendMessage(player, $"~r~[FEHLER]~s~ {message}~s~."); }