From 10f45f6cca6aec27c1b399d5ad07016edff36d3c Mon Sep 17 00:00:00 2001
From: Ilya <admin@redguy.ru>
Date: Tue, 23 Feb 2021 18:42:40 +0300
Subject: [PATCH] Some fixes

---
 MafiaGame/MainWindow.xaml         |  2 +-
 MafiaGame/MainWindow.xaml.cs      | 21 ++----------
 MafiaGame/ServerConnection.cs     | 55 +++++++++++++++++--------------
 MafiaServer/PlayerSocketWorker.cs |  3 +-
 MafiaServer/Program.cs            |  1 +
 5 files changed, 36 insertions(+), 46 deletions(-)

diff --git a/MafiaGame/MainWindow.xaml b/MafiaGame/MainWindow.xaml
index 89ca16f..bab6538 100644
--- a/MafiaGame/MainWindow.xaml
+++ b/MafiaGame/MainWindow.xaml
@@ -75,7 +75,7 @@
             <TextBox Grid.Column="1" Grid.Row="3" x:Name="IpBox" FontSize="30"></TextBox>
             <Button Grid.Column="1" Grid.Row="5" Click="ConnectToServer_OnClick" x:Name="IpInputGuiConnect">
                 <Viewbox>
-                    <TextBlock Text="Подключится" FontSize="25"></TextBlock>
+                    <TextBlock Text="Подключиться" FontSize="25"></TextBlock>
                 </Viewbox>
             </Button>
             <Button Grid.Column="1" Grid.Row="7" Click="Back_OnClick" x:Name="IpInputGuiBack">
diff --git a/MafiaGame/MainWindow.xaml.cs b/MafiaGame/MainWindow.xaml.cs
index 6c3fc39..6967a65 100644
--- a/MafiaGame/MainWindow.xaml.cs
+++ b/MafiaGame/MainWindow.xaml.cs
@@ -181,14 +181,7 @@ namespace MafiaGame
 
         public void ShowGameEnd(bool isWon, List<PlayerRole> playerRoles)
         {
-            if (isWon)
-            {
-                GameEndScreenWon.Text = "Ты победил!";
-            }
-            else
-            {
-                GameEndScreenWon.Text = "Ты проиграл!";
-            }
+            GameEndScreenWon.Text = isWon ? "Ты победил!" : "Ты проиграл!";
 
             string text = "";
             
@@ -269,8 +262,7 @@ namespace MafiaGame
             GameDaySelect.Items.Clear();
             foreach (Player player in players)
             {
-                ListBoxItem item = new ListBoxItem();
-                item.Content = player.Id.ToString() + ") " + player.Name;
+                ListBoxItem item = new ListBoxItem {Content = player.Id.ToString() + ") " + player.Name};
                 GameDaySelect.Items.Add(item);
             }
             if (role == Role.Died)
@@ -279,14 +271,7 @@ namespace MafiaGame
             }
             else
             {
-                if (voting)
-                {
-                    GameDayHotBar.Text = "Голосуй и молись";
-                }
-                else
-                {
-                    GameDayHotBar.Text = "Обсуждай и думай";
-                }
+                GameDayHotBar.Text = voting ? "Голосуй и молись" : "Обсуждай и думай";
             }
 
             GameDay.Visibility = Visibility.Visible;
diff --git a/MafiaGame/ServerConnection.cs b/MafiaGame/ServerConnection.cs
index 4880779..011a5bc 100644
--- a/MafiaGame/ServerConnection.cs
+++ b/MafiaGame/ServerConnection.cs
@@ -13,10 +13,10 @@ namespace MafiaGame
 {
     public class ServerConnection
     {
-        private String _host = "localhost";
-        private int _port = 25743;
-        private Socket _socket;
-        private Thread _thread;
+        private readonly String _host = "localhost";
+        private readonly int _port = 25743;
+        private readonly Socket _socket;
+        private readonly Thread _thread;
         private bool _breakFlag;
         private bool _connected;
 
@@ -77,13 +77,12 @@ namespace MafiaGame
             while (!_breakFlag)
             {
                 StringBuilder builder = new StringBuilder();
-                int bytes = 0;
                 byte[] data = new byte[256];
                 try
                 {
                     do
                     {
-                        bytes = _socket.Receive(data);
+                        var bytes = _socket.Receive(data);
                         builder.Append(Encoding.UTF8.GetString(data, 0, bytes));
                     } while (_socket.Available > 0);
                 }
@@ -125,13 +124,17 @@ namespace MafiaGame
                             MainWindow.Instance.QueueOnline.Text = ((WelcomePacket) packet).Players + "/" +
                                                                    ((WelcomePacket) packet).MaxPlayers;
                             MainWindow.Instance.ShowGameQueueScreen();
-                            Party party = new Party();
-                            party.ID = _host + ":" + _port;
-                            party.Size = ((WelcomePacket) packet).Players;
-                            party.Max = ((WelcomePacket) packet).MaxPlayers;
-                            Secrets secrets = new Secrets();
-                            secrets.JoinSecret = _host + ":" + _port + "/join";
-                            secrets.SpectateSecret = _host + ":" + _port + "/spectate";
+                            Party party = new Party
+                            {
+                                ID = _host + ":" + _port,
+                                Size = ((WelcomePacket) packet).Players,
+                                Max = ((WelcomePacket) packet).MaxPlayers
+                            };
+                            Secrets secrets = new Secrets
+                            {
+                                JoinSecret = _host + ":" + _port + "/join",
+                                SpectateSecret = _host + ":" + _port + "/spectate"
+                            };
                             App.Instance.GetRpcClient().SetPresence(new RichPresence()
                             {
                                 State = ((WelcomePacket) packet).ServerName,
@@ -239,8 +242,10 @@ namespace MafiaGame
                                     MainWindow.Instance.ShowVotingActive("Ты Дон, выбери кого убить!");
                                     foreach (Player player in players)
                                     {
-                                        ListBoxItem item = new ListBoxItem();
-                                        item.Content = player.Id.ToString() + ") " + player.Name;
+                                        ListBoxItem item = new ListBoxItem
+                                        {
+                                            Content = player.Id.ToString() + ") " + player.Name
+                                        };
                                         MainWindow.Instance.GameVotingActiveSelect.Items.Add(item);
                                     }
                                 });
@@ -253,8 +258,10 @@ namespace MafiaGame
                                     MainWindow.Instance.ShowVotingActive("Ты Мафия, выбери кого убить!");
                                     foreach (Player player in players)
                                     {
-                                        ListBoxItem item = new ListBoxItem();
-                                        item.Content = player.Id.ToString() + ") " + player.Name;
+                                        ListBoxItem item = new ListBoxItem
+                                        {
+                                            Content = player.Id.ToString() + ") " + player.Name
+                                        };
                                         MainWindow.Instance.GameVotingActiveSelect.Items.Add(item);
                                     }
                                 });
@@ -296,9 +303,7 @@ namespace MafiaGame
                                     case Role.Died:
                                         Application.Current.Dispatcher.Invoke(() =>
                                         {
-                                            String rol;
-                                            if (((GameStageChangedPacket)packet).Role == Role.Citizen) rol = "Мирный житель";
-                                            else rol = "Мёртв";
+                                            var rol = ((GameStageChangedPacket)packet).Role == Role.Citizen ? "Мирный житель" : "Мёртв";
                                             MainWindow.Instance.ShowVotingPassive("Ты " +rol+ "!");
                                         });
                                         break;
@@ -306,15 +311,15 @@ namespace MafiaGame
                                     case Role.Don:
                                         Application.Current.Dispatcher.Invoke(() =>
                                         {
-                                            String rol;
-                                            if (((GameStageChangedPacket)packet).Role == Role.Mafia) rol = "Мафия";
-                                            else rol = "Дон";
+                                            var rol = ((GameStageChangedPacket)packet).Role == Role.Mafia ? "Мафия" : "Дон";
                                             MainWindow.Instance.GameVotingActiveSelect.Items.Clear();
                                             MainWindow.Instance.ShowVotingActive("Ты "+rol+", выбери кого убить!");
                                             foreach (Player player in players)
                                             {
-                                                ListBoxItem item = new ListBoxItem();
-                                                item.Content = player.Id.ToString() + ") " + player.Name;
+                                                ListBoxItem item = new ListBoxItem
+                                                {
+                                                    Content = player.Id.ToString() + ") " + player.Name
+                                                };
                                                 MainWindow.Instance.GameVotingActiveSelect.Items.Add(item);
                                             }
                                         });
diff --git a/MafiaServer/PlayerSocketWorker.cs b/MafiaServer/PlayerSocketWorker.cs
index 9ab1b1e..fd44eec 100644
--- a/MafiaServer/PlayerSocketWorker.cs
+++ b/MafiaServer/PlayerSocketWorker.cs
@@ -23,11 +23,10 @@ namespace MafiaServer
         {
             _socket = socket;
             StringBuilder builder = new StringBuilder();
-            int bytes = 0;
             byte[] data = new byte[256];
             do
             {
-                bytes = _socket.Receive(data);
+                var bytes = _socket.Receive(data);
                 builder.Append(Encoding.UTF8.GetString(data, 0, bytes));
             } while (_socket.Available > 0);
 
diff --git a/MafiaServer/Program.cs b/MafiaServer/Program.cs
index 68f46b4..822c995 100644
--- a/MafiaServer/Program.cs
+++ b/MafiaServer/Program.cs
@@ -17,6 +17,7 @@ namespace MafiaServer
             while (!_breakFlag)
             {
                 String input = Console.ReadLine();
+                if(input == null) continue;
                 switch (input.Split(" ")[0].ToLower())
                 {
                     case "stop":