diff --git a/server/gameserver/hero.cc b/server/gameserver/hero.cc
index 18a6278e..a852f5b9 100644
--- a/server/gameserver/hero.cc
+++ b/server/gameserver/hero.cc
@@ -64,16 +64,6 @@ void Hero::Initialize()
     SetMaxHP(GetHP());
 }
 
-void Hero::FillMFObjectPart(Room* room, Human* hum, cs::MFObjectPart* part_data)
-{
-    PBUtils::Hero_FillMFObjectPart(this, room, hum, part_data);
-}
-
-void Hero::FillMFObjectFull(Room* room, Human* hum, cs::MFObjectFull* full_data)
-{
-    PBUtils::Hero_FillMFObjectFull(this, room, hum, full_data);
-}
-
 void Hero::Update(int delta_time)
 {
     ++updated_times_;
diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc
index 49f6aa8d..6e84a4df 100644
--- a/server/gameserver/pbutils.cc
+++ b/server/gameserver/pbutils.cc
@@ -23,6 +23,7 @@
 #include "mt/Param.h"
 #include "mt/Buff.h"
 #include "mt/Equip.h"
+#include "mt/Hero.h"
 
 void PBUtils::Ability_FillMFAttrAdditionList(Ability* self, Human* hum, cs::MFActivePlayerData* player_data)
 {
@@ -250,20 +251,17 @@ void Car::FillMFObjectFull(Room* room, Human* hum, cs::MFObjectFull* full_data)
     #endif
 }
 
-void PBUtils::Hero_FillMFObjectPart(Hero* self, Room* room, Human* hum, cs::MFObjectPart* part_data)
+void Hero::FillMFObjectPart(Room* room, Human* hum, cs::MFObjectPart* part_data)
 {
-    #if 0
     part_data->set_object_type(ET_Hero);
     cs::MFHeroPart* p = part_data->mutable_union_obj_10();
     p->set_obj_uniid(GetUniId());
     TypeConvert::ToPb(GetPos(), p->mutable_pos());
     TypeConvert::ToPb(GetAttackDir(), p->mutable_dir());
-    #endif
 }
 
-void PBUtils::Hero_FillMFObjectFull(Hero* self, Room* room, Human* hum, cs::MFObjectFull* full_data)
+void Hero::FillMFObjectFull(Room* room, Human* hum, cs::MFObjectFull* full_data)
 {
-    #if 0
     full_data->set_object_type(ET_Hero);
     cs::MFHeroFull* p = full_data->mutable_union_obj_10();
     p->set_obj_uniid(GetUniId());
@@ -278,7 +276,6 @@ void PBUtils::Hero_FillMFObjectFull(Hero* self, Room* room, Human* hum, cs::MFOb
     #if 0
     FillBuffList(hum, p->mutable_buff_list());
     #endif
-    #endif
 }
 
 void PBUtils::Loot_FillMFObjectPart(Loot* self, Room* room, Human* hum, cs::MFObjectPart* part_data)