From ee95d2591f8e4821af3b2b7960cf8c8be12688c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 12 Feb 2022 17:50:49 +0100 Subject: [PATCH] Code cleanup. --- OpenRA.Game/Network/Order.cs | 2 +- OpenRA.Game/Network/UnitOrders.cs | 4 ++-- OpenRA.Game/Server/Server.cs | 2 +- OpenRA.Game/Translation.cs | 2 +- OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs | 3 +-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/OpenRA.Game/Network/Order.cs b/OpenRA.Game/Network/Order.cs index ef39f463d3..c315fd1d28 100644 --- a/OpenRA.Game/Network/Order.cs +++ b/OpenRA.Game/Network/Order.cs @@ -73,7 +73,7 @@ namespace OpenRA public bool SuppressVisualFeedback; public ref readonly Target VisualFeedbackTarget => ref visualFeedbackTarget; - public Player Player => Subject != null ? Subject.Owner : null; + public Player Player => Subject?.Owner; readonly Target target; readonly Target visualFeedbackTarget; diff --git a/OpenRA.Game/Network/UnitOrders.cs b/OpenRA.Game/Network/UnitOrders.cs index bb91b15179..c647891a19 100644 --- a/OpenRA.Game/Network/UnitOrders.cs +++ b/OpenRA.Game/Network/UnitOrders.cs @@ -22,7 +22,7 @@ namespace OpenRA.Network static Player FindPlayerByClient(this World world, Session.Client c) { - return world.Players.FirstOrDefault(p => (p.ClientIndex == c.Index && p.PlayerReference.Playable)); + return world.Players.FirstOrDefault(p => p.ClientIndex == c.Index && p.PlayerReference.Playable); } internal static void ProcessOrder(OrderManager orderManager, World world, int clientId, Order order) @@ -63,7 +63,7 @@ namespace OpenRA.Network // ExtraData 0 means this is a normal chat order, everything else is team chat if (order.ExtraData == 0) { - var p = world != null ? world.FindPlayerByClient(client) : null; + var p = world?.FindPlayerByClient(client); var suffix = (p != null && p.WinState == WinState.Lost) ? " (Dead)" : ""; suffix = client.IsObserver ? " (Spectator)" : suffix; diff --git a/OpenRA.Game/Server/Server.cs b/OpenRA.Game/Server/Server.cs index 8daca24ad9..9ff4a90408 100644 --- a/OpenRA.Game/Server/Server.cs +++ b/OpenRA.Game/Server/Server.cs @@ -1076,7 +1076,7 @@ namespace OpenRA.Server { Conns.Remove(toDrop); - var dropClient = LobbyInfo.Clients.FirstOrDefault(c1 => c1.Index == toDrop.PlayerIndex); + var dropClient = LobbyInfo.Clients.FirstOrDefault(c => c.Index == toDrop.PlayerIndex); if (dropClient == null) { toDrop.Dispose(); diff --git a/OpenRA.Game/Translation.cs b/OpenRA.Game/Translation.cs index 5689b3f43f..a47abe2b34 100644 --- a/OpenRA.Game/Translation.cs +++ b/OpenRA.Game/Translation.cs @@ -110,7 +110,7 @@ namespace OpenRA value = args[i + 1]; if (value == null) - throw new ArgumentNullException("args", $"Expected the argument at index {i + 1} to be a non-null value"); + throw new ArgumentNullException(nameof(args), $"Expected the argument at index {i + 1} to be a non-null value"); argumentDictionary.Add(name, value); } diff --git a/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs b/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs index fd4760c4ab..93b39fd1ed 100644 --- a/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs +++ b/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs @@ -650,8 +650,7 @@ namespace OpenRA.Mods.Common.Server server.SendOrderTo(kickConn, "ServerError", "You have been kicked from the server."); server.DropClient(kickConn); - bool.TryParse(split[1], out var tempBan); - if (tempBan) + if (bool.TryParse(split[1], out var tempBan) && tempBan) { Log.Write("server", "Temporarily banning client {0} ({1}).", kickClientID, kickClient.IPAddress); server.SendMessage($"{client.Name} temporarily banned {kickClient.Name} from the server.");