From b7c4ad49b785d976545025baf1fa7e639877eea4 Mon Sep 17 00:00:00 2001
From: yuexin <yuexin@kingsome.cn>
Date: Thu, 24 Dec 2020 17:45:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E6=8A=A5=E9=94=99=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/PlayerHandler.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/rooms/logic/Handler/PlayerHandler.ts b/src/rooms/logic/Handler/PlayerHandler.ts
index 9348d53..74214eb 100644
--- a/src/rooms/logic/Handler/PlayerHandler.ts
+++ b/src/rooms/logic/Handler/PlayerHandler.ts
@@ -46,10 +46,10 @@ export class PlayerHandler {
     };
 
     public clear(bresetAll: boolean = false){
-        this._self = null;
         this._pets.forEach((item: PetHandler)=>{
             item.clear(bresetAll);
         });
+        this._self = null;
         this._pets.length = 0;
     };
 
@@ -326,7 +326,7 @@ export class PlayerHandler {
     };
 
     public die(){
-        this.clear();
+        this.clear(true);
         //todo:
     };
 
@@ -427,7 +427,7 @@ export class PlayerHandler {
             }
         });
 
-        if(this._self != apet){
+        if(this._self && this._self != apet){
             if(this._self.removeEffHalo(apet)){
                 lst.push(this._self);
             }