fix a bug

Cyl18 · Feb 19, 2018 · ac19930 · ac19930
1 parent 9483ab5
commit ac19930
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/CardSharp/GameComponents/Desk.cs b/CardSharp/GameComponents/Desk.cs
@@ -52,7 +52,7 @@ public GameState State
                     case LandlordDiscuss _:
                         return GameState.DiscussLandlord;
                     case CommandParser _:
-                        return GameState.StartGame;
+                        return GameState.Gaming;
                 }
 
                 return GameState.Unknown;
@@ -322,14 +322,22 @@ public override bool Equals(object obj)
         {
             return !(desk1 == desk2);
         }
+
+        public void BoardcastDesks()
+        {
+            foreach (var pair in Desks.Where(desk => desk.Value.State == GameState.Gaming))
+            {
+                AddMessageLine($"群{pair.Key}正在游戏中");
+            }
+        }
     }
 
 
     public enum GameState
     {
         Wait,
         DiscussLandlord,
-        StartGame,
+        Gaming,
         Unknown
     }
 }
diff --git a/CardSharp/GameSteps/CommandParser.cs b/CardSharp/GameSteps/CommandParser.cs
@@ -21,6 +21,7 @@ public void Parse(Desk desk, Player player, string command)
         {
             if (ParseInternal(desk, player, command)) return;
 
+            if (!IsValidPlayer(desk, desk.CurrentPlayer)) return;
             if (RunHostedCheck(desk))
                 return;
             if (desk.CurrentRule != null)

diff --git a/CardSharp/GameSteps/StandardParser.cs b/CardSharp/GameSteps/StandardParser.cs
@@ -43,7 +43,7 @@ public void Parse(Desk desk, Player player, string command)
                     desk.AddMessage($"你的积分为 {pconfig.Point}");
                     break;
                 case "重新发牌":
-                    if (desk.State == GameState.StartGame || desk.State == GameState.DiscussLandlord)
+                    if (desk.State == GameState.Gaming || desk.State == GameState.DiscussLandlord)
                         desk.SendCardsMessage();
                     break;
                 case "命令列表":
@@ -109,6 +109,9 @@ 带有[R]的命令 是正式功能，'一般'不会做更改
                         player.ForceSend = true;
                         player.AddMessage(string.Join(Environment.NewLine, desk.Players.Select(p => $"{p.PlayerId} {p.Cards.ToFormatString()}")));
                         break;
+                    case "所有游戏":
+                        desk.BoardcastDesks();
+                        break;
                 }
 
                 if (command.StartsWith("设置积分")) {