From 002cc8fc35d001c7bfa95ca57e884c5e0e7ffc18 Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Tue, 8 Dec 2020 17:37:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=B8=80=E4=BA=9B=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/commands/DiscardCommand.ts    | 2 +-
 src/rooms/commands/EatConfirmCommand.ts | 4 ++--
 src/rooms/commands/SelectPetCommand.ts  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/rooms/commands/DiscardCommand.ts b/src/rooms/commands/DiscardCommand.ts
index 05d3780..5713cf0 100644
--- a/src/rooms/commands/DiscardCommand.ts
+++ b/src/rooms/commands/DiscardCommand.ts
@@ -44,7 +44,7 @@ export class DiscardCommand extends Command<CardGameState, { client: Client, car
         }
         this.state.cards.clear();
         //停止出牌计时, 并更新player.extraTime;
-        if (this.room.mainClock && this.room.mainClock.active) {
+        if (this.room.mainClock?.active) {
             let maxTime = singleton(GameEnv).maxDiscardTime * 1000;
             let count = this.room.mainClock.elapsedTime - maxTime;
             let newCount = player.extraTime - count;
diff --git a/src/rooms/commands/EatConfirmCommand.ts b/src/rooms/commands/EatConfirmCommand.ts
index 541b2d3..02745de 100644
--- a/src/rooms/commands/EatConfirmCommand.ts
+++ b/src/rooms/commands/EatConfirmCommand.ts
@@ -32,7 +32,7 @@ export class EatConfirmCommand extends Command<CardGameState, { timeUp: boolean
         }
         if (giveUpCount >= playerCount) {
             // 所有人都放弃了, 则取消定时, 直接进入下一轮
-            if (this.room.mainClock && this.room.mainClock.active) {
+            if (this.room.mainClock?.active) {
                 this.room.mainClock.clear();
             }
             return [new TurnEndCommand()];
@@ -67,7 +67,7 @@ export class EatConfirmCommand extends Command<CardGameState, { timeUp: boolean
         // 吃牌逻辑
         if (player != null && (isFirst || timeUp)) {
             // 如果有吃牌计时的话,停止吃牌计时
-            if (this.room.mainClock && this.room.mainClock.active) {
+            if (this.room.mainClock?.active) {
                 this.room.mainClock.clear();
             }
             for (let id of cards) {
diff --git a/src/rooms/commands/SelectPetCommand.ts b/src/rooms/commands/SelectPetCommand.ts
index 4e6493b..4cea94f 100644
--- a/src/rooms/commands/SelectPetCommand.ts
+++ b/src/rooms/commands/SelectPetCommand.ts
@@ -72,7 +72,7 @@ export class SelectPetCommand extends Command<CardGameState, {client: Client,
             return;
         }
         //停止选随从计时, 并更新player.extraTime;
-        if (this.room.mainClock && this.room.mainClock.active) {
+        if (this.room.mainClock?.active) {
             let count = this.room.mainClock.elapsedTime - singleton(GameEnv).playerActTime * 1000;
             let newCount = player.extraTime - count;
             player.extraTime = Math.max(newCount, 0);