diff --git a/src/rooms/logic/Handler/BattleHandler.ts b/src/rooms/logic/Handler/BattleHandler.ts
index f12e5dd..58ed024 100644
--- a/src/rooms/logic/Handler/BattleHandler.ts
+++ b/src/rooms/logic/Handler/BattleHandler.ts
@@ -63,7 +63,7 @@ export class BattleHandler {
             return false;
         }
         let obj = players.find( (item: PlayerHandler) =>{
-            item.isMyPet(pet);
+            return item.isMyPet(pet);
         });
         if(!obj){
             return false;
@@ -165,7 +165,7 @@ export class BattleHandler {
                 }
                 break;
             case GameCampType.ENEMY:
-                if(dst && dst._friend != src && dst.isAlive()){
+                if(dst && dst != src && dst._friend != src && dst.isAlive()){
                     lst.push(dst);
                 }
                 break;