TODO fix exceptions losing

ProMix0 · May 18, 2022 · edd93e6 · edd93e6
1 parent 8d5ede4
commit edd93e6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/CrossesZeroes/Classes/CrossesZeroesGame.cs b/CrossesZeroes/Classes/CrossesZeroesGame.cs
@@ -25,7 +25,7 @@ public CrossesZeroesGame(IPlayer player1, IPlayer player2, ICrossesZeroesField f
         private bool gameCompleted = false;
 
         /// <inheritdoc/>
-        public async override Task<bool >Turn()
+        public async override Task<bool> Turn()
         {
             if (gameCompleted) return false;
             field.Set(await cross.Turn(field.AsReadonly()), CellState.Cross);
@@ -69,9 +69,7 @@ public override void Restart()
             gameCompleted = false;
 
             //Смена знака игроков
-            IPlayer temp = cross;
-            cross = zero;
-            zero = temp;
+            (zero, cross) = (cross, zero);
 
             cross.Init(CellState.Cross);
             zero.Init(CellState.Zero);

diff --git a/CrossesZeroes/Classes/CustomizableField.cs b/CrossesZeroes/Classes/CustomizableField.cs
@@ -168,8 +168,8 @@ void GetDownDiagonal(int i, int j)
 
         public virtual void Set(Point point, CellState markType)
         {
-            if (markType == CellState.Empty) throw new ArgumentException("", nameof(markType));
-            if (field[point.x, point.y] != CellState.Empty) throw new ArgumentException("", nameof(point));
+            if (markType == CellState.Empty) throw new ArgumentException("Unknown type of mark", nameof(markType));
+            if (field[point.x, point.y] != CellState.Empty) throw new ArgumentException("Cell already filled", nameof(point));
 
             field[point.x, point.y] = markType;
         }

diff --git a/HostApp/Program.cs b/HostApp/Program.cs
@@ -10,7 +10,9 @@
 using Microsoft.Extensions.Options;
 using WpfClient;
 
-await Host.CreateDefaultBuilder()
+Console.WriteLine("Building host");
+
+IHost host = Host.CreateDefaultBuilder()
     .ConfigureAppConfiguration(config =>
         config.AddJsonFile("Settings.json"))
 
@@ -43,4 +45,12 @@ await Host.CreateDefaultBuilder()
     .ConfigureLogging(logging =>
         logging.ClearProviders())
 
-    .RunConsoleAsync();
+    .UseConsoleLifetime()
+
+    .Build();
+
+Console.WriteLine("Running host");
+
+await host.RunAsync();
+
+Console.WriteLine("Host shut down");
diff --git a/WpfClient/WpfPlayer.cs b/WpfClient/WpfPlayer.cs
@@ -41,7 +41,7 @@ public WpfPlayer()
 
             while (client == null) Thread.Sleep(10);
 
-            Console.WriteLine("Client isn't null");
+            //Console.WriteLine("Client isn't null");
         }
 
         public void ReportEnd(bool victory, ICrossesZeroesField field)