From 076d21341bf5901bb78b4f66da7d0cfae5fe78f7 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 14 Jun 2023 17:59:41 +0800 Subject: [PATCH] 1 --- server/gameserver/room.cc | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index d8e1c158..043ca216 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -455,11 +455,15 @@ Human* Room::FindEnemy(Human* hum, float range) if (!hum->dead && !a8::HasBitFlag(hum->status, CS_Disable) && hum->team_id != myself->team_id) { - float distance = hum->GetPos().Distance2D2(myself->GetPos()); - if (distance <= range) { - if (distance < last_distance) { - target = hum; - last_distance = distance; + if (a8::HasBitFlag(hum->status, CS_DisableAttackAndroid) && + target->IsAndroid()) { + } else { + float distance = hum->GetPos().Distance2D2(myself->GetPos()); + if (distance <= range) { + if (distance < last_distance) { + target = hum; + last_distance = distance; + } } } }