From 4a8609a3d26605611a9b6ad23a4d63124ba930d1 Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Sat, 15 Jun 2019 20:28:15 +0300 Subject: [PATCH] (22cc67cdc) Fix to nullref exception in NetLobbyScreen.Ban methods --- .../BarotraumaClient/Source/Screens/NetLobbyScreen.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs index d392f2bfa..af9b4b109 100644 --- a/Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs +++ b/Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs @@ -1605,24 +1605,21 @@ namespace Barotrauma public bool KickPlayer(GUIButton button, object userData) { - Client client = userData as Client; - if (client == null || GameMain.NetworkMember == null) return false; + if (!(userData is Client client) || GameMain.NetworkMember == null) return false; GameMain.Client.CreateKickReasonPrompt(client.Name, false); return false; } public bool BanPlayer(GUIButton button, object userData) { - Client client = userData as Client; - if (userData == null || GameMain.NetworkMember == null) return false; + if (!(userData is Client client) || GameMain.NetworkMember == null) return false; GameMain.Client.CreateKickReasonPrompt(client.Name, true); return false; } public bool BanPlayerRange(GUIButton button, object userData) { - Client client = userData as Client; - if (userData == null || GameMain.NetworkMember == null) return false; + if (!(userData is Client client) || GameMain.NetworkMember == null) return false; GameMain.Client.CreateKickReasonPrompt(client.Name, true, true); return false; }