1

server/gameserver/custom_battle.cc

@@ -5,6 +5,8 @@
 #include "custom_member.h"
 #include "netdata.h"
 #include "roommgr.h"
+#include "room.h"
+#include "player.h"
 
 #include "cs_proto.pb.h"
 
@@ -317,6 +319,18 @@ void CustomBattle::OnEnter(std::shared_ptr<cs::CMJoin> join_msg, long ip_saddr,
             pair.second->is_ready_ = 1;
             OnMemberReady(pair.second.get());
         }
+        if (GetRoom()) {
+            #if 0
+            if (GetRoom()->GetGasData().GetGasMode() != GasInactive) {
+                return;
+            }
+            #endif
+            auto hum = GetRoom()->GetPlayerByAccountId(join_msg->account_id());
+            if (hum) {
+                hum->ReJoin(ip_saddr, socket_handle, join_msg);
+            }
+            return;
+        }
     }
 }