From 63649f40e6aa5c40b0047594178f75dd1d7df1c0 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 30 May 2024 17:52:38 +0800
Subject: [PATCH] 1

---
 server/gameserver/pbutils.cc | 46 ++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc
index f1eaddac..3df4f5e0 100644
--- a/server/gameserver/pbutils.cc
+++ b/server/gameserver/pbutils.cc
@@ -1113,32 +1113,9 @@ void Human::FillSMGameOver(cs::SMGameOver& msg)
         msg.set_star_num(mt::Param::GetStarNum(stats->rank));
     }
     #endif
-    if (room->GetCustomBattle()) {
-        msg.mutable_settlement_new()->set_custom_battle(1);
-    } else {
-        msg.mutable_settlement_new()->set_custom_battle(0);
-    }
-    {
-        auto data = a8::MutableXObject::CreateObject();
-        data->SetVal("room_uuid", a8::XValue(room->GetRoomUuid()).GetString());
-        data->SetVal("room_mode", room->GetReportRoomMode());
-        data->SetVal("team_id", GetTeam()->GetTeamId());
-        data->SetVal("map_id", room->GetMapMeta()->map_id());
-        data->SetVal("battle_uuid", GetTeam()->GetBattleUuid());
-        std::string custom_data = a8::openssl::md5
-            (data->ToJsonStr() + "520d8eAbB(8cf1^#$^&!@d833a42c820432PDAFE^^)") + "|" +
-            data->ToJsonStr();
-        msg.mutable_settlement_new()->set_box_payload(custom_data);
-    }
-    if (room->IsAlreadyRoomReportBattle()) {
-        auto p = msg.mutable_settlement_new();
-        GetTeam()->FillMFSettlementNew(msg.mutable_settlement_new());
-        return;
-    } else {
-        auto p = msg.mutable_settlement_new();
-        GetTeam()->FillMFSettlementNew(msg.mutable_settlement_new());
-        return;
-    }
+    auto p = new cs::MFSettlementNew();
+    GetTeam()->FillMFSettlementNew(p);
+    *msg.mutable_settlement_new() = *p;
 }
 
 void Human::FillMFActivePlayerData(cs::MFActivePlayerData* player_data)
@@ -2317,6 +2294,23 @@ void GGListener::_SS_WSP_SocketDisconnect(f8::MsgHdr* hdr, const ss::SS_WSP_Sock
 
 void Team::FillMFSettlementNew(cs::MFSettlementNew* p)
 {
+    if (room->GetCustomBattle()) {
+        p->set_custom_battle(1);
+    } else {
+        p->set_custom_battle(0);
+    }
+    {
+        auto data = a8::MutableXObject::CreateObject();
+        data->SetVal("room_uuid", a8::XValue(room->GetRoomUuid()).GetString());
+        data->SetVal("room_mode", room->GetReportRoomMode());
+        data->SetVal("team_id", GetTeamId());
+        data->SetVal("map_id", room->GetMapMeta()->map_id());
+        data->SetVal("battle_uuid", GetBattleUuid());
+        std::string custom_data = a8::openssl::md5
+            (data->ToJsonStr() + "520d8eAbB(8cf1^#$^&!@d833a42c820432PDAFE^^)") + "|" +
+            data->ToJsonStr();
+        p->set_box_payload(custom_data);
+    }
     if (room->IsAlreadyRoomReportBattle()) {
         p->set_settlement_status(1);
         p->set_version(20230321);