From acf0fd0d576523376f82128229fd66c1048d825f Mon Sep 17 00:00:00 2001
From: yuexin <yuexin@kingsome.cn>
Date: Fri, 11 Dec 2020 17:44:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=8E=B7=E5=8F=96=E9=98=9F?=
 =?UTF-8?q?=E5=8F=8B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/logic/Handler/BattleHandler.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/rooms/logic/Handler/BattleHandler.ts b/src/rooms/logic/Handler/BattleHandler.ts
index d4dbea6..025b9c0 100644
--- a/src/rooms/logic/Handler/BattleHandler.ts
+++ b/src/rooms/logic/Handler/BattleHandler.ts
@@ -60,13 +60,19 @@ export class BattleHandler {
     };
 
     public getFriend(aplayer: PlayerHandler): PlayerHandler{
-        let obj;
+        if(aplayer && aplayer._friend){
+            return aplayer._friend;
+        }
+        // 防止出错冗余处理
+        let res;
         for(let [key, obj] of this._players){
             if(obj._friend == aplayer){
+                aplayer._friend = obj;
+                res = obj;
                 break;
             }
         }
-        return obj;
+        return res;
     };
 
     public petIsValid(pet: PetHandler, players: PlayerHandler[], ct: GameUnitType): boolean{