From 4d4169c32dfbd4ee12dcbc7889bbd1845fbb17f8 Mon Sep 17 00:00:00 2001
From: yuexin <yuexin@kingsome.cn>
Date: Fri, 4 Dec 2020 17:18:43 +0800
Subject: [PATCH] add player to petinfomsg

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

diff --git a/src/rooms/logic/Handler/BattleHandler.ts b/src/rooms/logic/Handler/BattleHandler.ts
index 5fd2c0b..7e8d000 100644
--- a/src/rooms/logic/Handler/BattleHandler.ts
+++ b/src/rooms/logic/Handler/BattleHandler.ts
@@ -275,10 +275,10 @@ export class BattleHandler {
     };
 
     public onPlayerAddCard(aplayer: PlayerHandler, count: number, maxcount: number){
-        return this._room.addCard(aplayer._player.heroId + '', count, maxcount);
+        return this._room.addCard(aplayer.getId(), count, maxcount);
     };
 
     public onPlayerStealCard(srcplayer: PlayerHandler, dstplayer: PlayerHandler, count: number){
-        return this._room.drawCardFromPlayer(srcplayer._player.heroId + '', dstplayer._player.heroId + '', count);
+        return this._room.drawCardFromPlayer(srcplayer.getId(), dstplayer.getId(), count);
     };
 }
diff --git a/src/rooms/logic/Handler/PetHandler.ts b/src/rooms/logic/Handler/PetHandler.ts
index b4df8b6..d4a8521 100644
--- a/src/rooms/logic/Handler/PetHandler.ts
+++ b/src/rooms/logic/Handler/PetHandler.ts
@@ -170,6 +170,7 @@ export class PetHandler {
             ap: this._baseap,
             extAp: this._exap,
             pos: this._idx,
+            player: this._owner.getId(),
             harmReduce: this._exredhurt,
             skills: this._selfskills,
             extSkills: this._exskills
diff --git a/src/rooms/logic/Handler/PlayerHandler.ts b/src/rooms/logic/Handler/PlayerHandler.ts
index 4e5d472..9f450a7 100644
--- a/src/rooms/logic/Handler/PlayerHandler.ts
+++ b/src/rooms/logic/Handler/PlayerHandler.ts
@@ -49,6 +49,10 @@ export class PlayerHandler {
         return 0;
     };
 
+    public getId(): string{
+        return this._player.heroId + '';
+    };
+
     public newPet(): PetHandler {
         let res = null;
         let pr = null;