From afb78df7e5f2d5a50cb73cc857747d528c585f5c Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Fri, 19 Feb 2021 19:37:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E7=89=8C=E8=BF=87?=
 =?UTF-8?q?=E7=A8=8B=E4=B8=AD=E7=9A=84=E5=90=83=E7=89=8C=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/commands/DiscardCommand.ts | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/rooms/commands/DiscardCommand.ts b/src/rooms/commands/DiscardCommand.ts
index 1600197..af2d5b6 100644
--- a/src/rooms/commands/DiscardCommand.ts
+++ b/src/rooms/commands/DiscardCommand.ts
@@ -48,11 +48,6 @@ export class DiscardCommand extends Command<CardGameState, { client: Client, car
             this.room.send(client,'discard_card_s2c', {errcode: 3, errmsg: '不是当前轮'});
             return;
         }
-
-        if (!gameUtil.checkDiscard(tmpCards, new GameEnv().selfEatCount)) {
-            this.room.send(client,'discard_card_s2c', {errcode: 4, errmsg: '出牌不符合规则'});
-            return;
-        }
         if (target) {
             if (this.state.cards.size > 1) {
                 this.room.send(client,'discard_card_s2c', {errcode: 6, errmsg: '不符合吃牌规则'});
@@ -62,12 +57,22 @@ export class DiscardCommand extends Command<CardGameState, { client: Client, car
                 this.room.send(client,'discard_card_s2c', {errcode: 5, errmsg: '找不到要吃的牌'});
                 return;
             }
+            let tmpCards2 = tmpCards.concat(...this.state.cards.values())
+            if (!gameUtil.checkDiscard(tmpCards2, new GameEnv().otherEatCount)) {
+                this.room.send(client,'discard_card_s2c', {errcode: 4, errmsg: '出牌不符合规则'});
+                return;
+            }
         } else {
+            if (!gameUtil.checkDiscard(tmpCards, new GameEnv().selfEatCount)) {
+                this.room.send(client,'discard_card_s2c', {errcode: 4, errmsg: '出牌不符合规则'});
+                return;
+            }
             for (let [key, val] of this.state.cards) {
                 this.state.cards.delete(key);
             }
         }
 
+
         //停止出牌计时, 并更新player.extraTime;
         let elapsedTime = this.room.stopSchedule('draw_card');
         if (elapsedTime >= 0) {