From c74d4fdbe0aa5a55304d1665f500bec2e9d71e94 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 28 Dec 2023 17:21:37 +0800
Subject: [PATCH] 1

---
 server/gameserver/pbutils.cc | 20 +++++++++++++++++++-
 server/gameserver/room.cc    |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc
index 20945cd6..ef34476b 100644
--- a/server/gameserver/pbutils.cc
+++ b/server/gameserver/pbutils.cc
@@ -46,6 +46,7 @@
 #include "batchsync.h"
 #include "mobabattle.h"
 #include "roommgr.h"
+#include "bornpoint.h"
 
 #include "mt/Param.h"
 #include "mt/Buff.h"
@@ -2052,6 +2053,9 @@ void Human::ReJoin(long ip_saddr, int socket_handle, std::shared_ptr<cs::CMJoin>
     PushJoinRoomMsg();
     RefreshView();
     room->NotifyUiUpdate();
+    if (room->IsMobaModeRoom()) {
+        SendMobaTeamNotify();
+    }
 }
 
 void GGListener::SendError(int sockhandle, unsigned int seqid,
@@ -2383,10 +2387,24 @@ int Room::InitWithMobaBattle(long ip_saddr, int socket_handle, std::shared_ptr<c
                  return true;
              });
     };
+    int side = a8::RandEx(1, 2);
     for (size_t i = 0; i < 2; ++i) {
         auto team = room_teams.at(i);
         if (team->GetMemberNum() < MAX_TEAM_NUM) {
-            CreateAndroid(MAX_TEAM_NUM - team->GetMemberNum());
+            CreateAndroid(MAX_TEAM_NUM - team->GetMemberNum(), team);
+        }
+        team->TraverseMembers
+            (
+             [this, side] (Human* hum) -> bool
+             {
+                 hum->side = side;
+                 hum->born_point->wo_meta = std::get<0>(GetMapMeta()->moba_born_points.at(side - 1));
+                 hum->InitMobaRoad();
+             });
+        if (side == 1) {
+            side == 2;
+        } else {
+            side == 1;
         }
     }
     {
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index b53049b5..277b2b3f 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -352,7 +352,7 @@ void Room::AddPlayer(Player* hum, std::shared_ptr<BornPoint> init_born_point, bo
             acc_inactive_time_ += GetGasInactiveReaminTime() - 2;
         }
     }
-#ifdef MYDEBUG
+#ifdef MYDEBUG1
     if (IsMobaModeRoom()) {
         CreateAndroid(7);
         std::vector<Human*> humans;