From ad82682852494b08d2c97be0ada3197149b7a223 Mon Sep 17 00:00:00 2001
From: "y.x" <yuexin@kingsome.cn>
Date: Tue, 29 Dec 2020 12:17:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8D=E6=AD=BB=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/logic/Handler/BattleHandler.ts | 3 +--
 src/rooms/logic/Handler/PetHandler.ts    | 1 +
 src/rooms/logic/Handler/PlayerHandler.ts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/rooms/logic/Handler/BattleHandler.ts b/src/rooms/logic/Handler/BattleHandler.ts
index 40ceb1d..4b1592f 100644
--- a/src/rooms/logic/Handler/BattleHandler.ts
+++ b/src/rooms/logic/Handler/BattleHandler.ts
@@ -498,8 +498,6 @@ export class BattleHandler {
             return;
         }
         sp.srcplayer && sp.srcplayer.onUseCardEnd(sp);
-
-        this.checkPets();
     };
 
     /**
@@ -548,6 +546,7 @@ export class BattleHandler {
     public onPlayerRoundEnd(aplayer: Player){
         let ph = this.getPlayer(aplayer);
         ph && ph.onRoundEnd();
+        this.checkPets();
     };
 
     /**
diff --git a/src/rooms/logic/Handler/PetHandler.ts b/src/rooms/logic/Handler/PetHandler.ts
index 7f7046a..bc7b038 100644
--- a/src/rooms/logic/Handler/PetHandler.ts
+++ b/src/rooms/logic/Handler/PetHandler.ts
@@ -262,6 +262,7 @@ export class PetHandler {
                 this.dataChanged();
                 this.addHP(tmp);
             }else{
+                this.dataChanged();
                 this.die();
             }
         }else{
diff --git a/src/rooms/logic/Handler/PlayerHandler.ts b/src/rooms/logic/Handler/PlayerHandler.ts
index 2825c8b..decc119 100644
--- a/src/rooms/logic/Handler/PlayerHandler.ts
+++ b/src/rooms/logic/Handler/PlayerHandler.ts
@@ -658,7 +658,7 @@ export class PlayerHandler {
     };
 
     checkPets(breset: boolean = false){
-        for(let i = this._pets.length - 1; i > 0; i--){
+        for(let i = this._pets.length - 1; i >= 0; i--){
             let pet = this._pets[i];
             if(pet && !pet.isAlive()){
                 this.delPet(pet);