fix: 修復在旁觀者按下元素會產生的錯誤

Game-as-a-Service · Jun 13, 2024 · acca84d · acca84d
1 parent 7b4ccc4
commit acca84d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Clients/Monopoly.Clients.Web/Pages/Ready/ReadyPage.razor.cs b/Clients/Monopoly.Clients.Web/Pages/Ready/ReadyPage.razor.cs
@@ -115,16 +115,28 @@ await Popup.Show(new Popup.PopupParameter
 
     private async Task OnSelectColor(ColorEnum color)
     {
+        if (CurrentPlayer is null)
+        {
+            return;
+        }
         await Connection.SelectLocation(color.ToLocationEnum());
     }
 
     private async Task OnSelectRole(string role)
     {
+        if (CurrentPlayer is null)
+        {
+            return;
+        }
         await Connection.SelectRole(role);
     }
 
     private async Task OnReady()
     {
+        if (CurrentPlayer is null)
+        {
+            return;
+        }
         await Connection.PlayerReady();
     }
 

diff --git a/Clients/Monopoly.Clients.Web/Program.cs b/Clients/Monopoly.Clients.Web/Program.cs
@@ -11,7 +11,7 @@
 
 builder.Services.AddOptions<MonopolyApiOptions>()
     .Configure(options => { builder.Configuration.GetSection(nameof(MonopolyApiOptions)).Bind(options); });
-builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
+builder.Services.AddScoped(_ => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 
 // Register the MonopolyApiClient
 builder.Services.AddHttpClient<MonopolyDevelopmentApiClient>(client =>