From 8deb24c27667dd76377c9832388b97a9e9f74bf6 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sun, 4 Feb 2024 13:12:25 +0800
Subject: [PATCH] 1

---
 server/gameserver/custom_battle.cc | 4 ++--
 server/gameserver/room.cc          | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/gameserver/custom_battle.cc b/server/gameserver/custom_battle.cc
index fdb95028..30ca5a2f 100644
--- a/server/gameserver/custom_battle.cc
+++ b/server/gameserver/custom_battle.cc
@@ -66,7 +66,7 @@ void CustomBattle::ParseResult(a8::XObject& obj)
                 auto member = std::make_shared<CustomMember>();
                 member->team_ = team.get();
                 member->account_id_ = member_obj->Get("account_id").GetString();
-#ifdef MYDEBUG1
+#ifdef MYDEBUG
                 if (IsMoba()) {
                     member->account_id_ = member->account_id_ + "$$$$";
                 }
@@ -83,7 +83,7 @@ void CustomBattle::ParseResult(a8::XObject& obj)
                 member_id_hash_[member->account_id_] = member;
                 team->member_hash_[member->account_id_] = member;
                 account_hash_[member->account_id_] = team;
-#ifdef MYDEBUG1
+#ifdef MYDEBUG
                 if (IsMoba()) {
                     auto member = std::make_shared<CustomMember>();
                     member->team_ = ob_team_.get();
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 2dda6fbd..9e8f4e54 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -412,7 +412,9 @@ void Room::AddPlayer(Player* hum, std::shared_ptr<BornPoint> init_born_point, bo
     AddToMoveableHash(hum);
     AddToAccountHash(hum);
     AddToHumanHash(hum);
-    AddToAliveHumanHash(hum);
+    if (!hum->IsOb()) {
+        AddToAliveHumanHash(hum);
+    }
     if (!no_matchteam) {
         MatchTeam(hum);
     }