diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc
index 7bc6c665..d79ead38 100644
--- a/server/gameserver/roommgr.cc
+++ b/server/gameserver/roommgr.cc
@@ -733,12 +733,12 @@ void RoomMgr::SendGetBattleData(int mode,
         std::make_shared<std::vector<std::shared_ptr<BattleDataContext>>>();
     bool is_old_version = false;
     for (auto& msg : join_msgs) {
-        BattleDataContext context;
-        context.join_msg = msg;
-        context.battle_uuid = App::Instance()->NewUuid();
-        context.errcode = 100;
-        context.errmsg = "";
-        //result->push_back(context);
+        std::shared_ptr<BattleDataContext> context = std::make_shared<BattleDataContext>();
+        context->join_msg = msg;
+        context->battle_uuid = App::Instance()->NewUuid();
+        context->errcode = 100;
+        context->errmsg = "";
+        result->push_back(context);
         if (msg->proto_version() < 2022032201) {
             is_old_version = true;
             break;