diff --git a/server/gameserver/matchteam.cc b/server/gameserver/matchteam.cc
index 62b3e0be..1e99183e 100644
--- a/server/gameserver/matchteam.cc
+++ b/server/gameserver/matchteam.cc
@@ -19,12 +19,19 @@ void RawTeamMember::FillMFMatchTeamMember(cs::MFMatchTeamMember* p)
     p->set_account_id(msg->account_id());
     p->set_name(msg->name());
     p->set_avatar_url(msg->avatar_url());
+    #if 1
+    {
+        p->set_hero_id(msg->hero_id());
+        *p->mutable_weapons() = msg->weapons();
+    }
+    #else
     if (choose_hero_times <= 0) {
         p->set_hero_id(0);
     } else {
         p->set_hero_id(msg->hero_id());
         *p->mutable_weapons() = msg->weapons();
     }
+    #endif
     p->set_is_leader(is_leader);
     p->set_state(state);
     p->set_head_frame(msg->head_frame());