From 3288cb74a0b2e1edbff026466833ae08ce996d4c Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Mon, 7 Dec 2020 20:52:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=83=E7=89=8C=E5=90=8E=E6=B8=85=E9=99=A4?=
 =?UTF-8?q?=E5=90=83=E7=89=8C=E7=9A=84=E5=AE=9A=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/commands/EatCardCommand.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/rooms/commands/EatCardCommand.ts b/src/rooms/commands/EatCardCommand.ts
index a9cca87..de39edd 100644
--- a/src/rooms/commands/EatCardCommand.ts
+++ b/src/rooms/commands/EatCardCommand.ts
@@ -51,12 +51,15 @@ export class EatCardCommand extends Command<CardGameState, { client: Client, car
         this.state.gameState = GameStateConst.STATE_PICK_PET;
         let time = singleton(GameEnv).playerActTime * 1000 + player.extraTime;
         let self = this;
+        if (this.room.mainClock && this.room.mainClock.active) {
+            this.room.mainClock.clear();
+        }
         this.room.mainClock = this.clock.setTimeout(function (){
             player.extraTime = 0;
             self.room.mainClock.clear();
             debugRoom('选随从或者法术时间到, 自动出牌, 自动进入下一轮');
             self.room.dispatcher.dispatch(new TurnEndCommand());
-        }.bind(this), time);
+        }, time);
         let fromPlayer = this.state.players.get(this.state.currentTurn);
         if (fromPlayer.id !== player.id) {
             this.room.battleMan.onCardLinkReady(player, fromPlayer);