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);