From f1dadfade9aa2feff7702b7c76a29f1c1ff45427 Mon Sep 17 00:00:00 2001 From: sprayzcs <33363043+sprayzcs@users.noreply.github.com> Date: Tue, 25 Sep 2018 10:43:34 +0200 Subject: [PATCH 1/2] Finally fixed /time --- Server/Commands/Admin.cs | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs index b4a0e348..3f88f17a 100644 --- a/Server/Commands/Admin.cs +++ b/Server/Commands/Admin.cs @@ -482,20 +482,10 @@ namespace reallife_gamemode.Server.Commands ChatService.NotAuthorized(player); return; } - if (min == 0) - { - NAPI.Chat.SendChatMessageToAll("Serverzeit wurde auf "+hour+":00:00 gesetzt!"); - NAPI.World.SetTime(hour, min, sec); - return; - } - if (sec == 0) - { - NAPI.Chat.SendChatMessageToAll("Serverzeit wurde auf " + hour + ":"+min+":00 gesetzt!"); - NAPI.World.SetTime(hour, min, sec); - return; - } - NAPI.Chat.SendChatMessageToAll("Serverzeit wurde auf " + hour + ":" + min + ":"+sec+" gesetzt!"); + string broadcastMsg = $"Serverzeit wurde auf {hour:D2}:{min:D2}:{sec:D2} gesetzt!"; + + NAPI.Chat.SendChatMessageToAll(broadcastMsg); NAPI.World.SetTime(hour, min, sec); return; From f634af01ab526d45a8141f55ac7b9b32f6303fd3 Mon Sep 17 00:00:00 2001 From: sprayzcs <33363043+sprayzcs@users.noreply.github.com> Date: Tue, 25 Sep 2018 10:57:10 +0200 Subject: [PATCH 2/2] Changed ClientService.GetClientFromName() to case-insensitive names --- Server/Services/ClientService.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Server/Services/ClientService.cs b/Server/Services/ClientService.cs index 6959b3fa..f5459efa 100644 --- a/Server/Services/ClientService.cs +++ b/Server/Services/ClientService.cs @@ -21,13 +21,14 @@ namespace reallife_gamemode.Server.Services * Gibt "null" zurück, falls kein Client gefunden wurde */ Client toReturn = null; + name = name.ToLower(); List playerList = NAPI.Pools.GetAllPlayers(); - toReturn = playerList.Find(p => p.Name == name); + toReturn = playerList.Find(p => p.Name.ToLower() == name); if(toReturn == null) { - toReturn = playerList.Find(p => p.Name.StartsWith(name)); + toReturn = playerList.Find(p => p.Name.ToLower().StartsWith(name)); } return toReturn;