From 5a9936cb70de6b2171ed684098c337795e9e8bfa Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sun, 25 Dec 2022 09:43:36 +0800
Subject: [PATCH] 1

---
 server/gameserver/obstacle.cc | 10 ----------
 server/gameserver/pbutils.cc  | 10 ++++------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/server/gameserver/obstacle.cc b/server/gameserver/obstacle.cc
index fa9d01f9..b71c992e 100644
--- a/server/gameserver/obstacle.cc
+++ b/server/gameserver/obstacle.cc
@@ -105,16 +105,6 @@ void Obstacle::RecalcSelfCollider()
     #endif
 }
 
-void Obstacle::FillMFObjectPart(Room* room, Human* hum, cs::MFObjectPart* part_data)
-{
-    PBUtils::Obstacle_FillMFObjectPart(this, room, hum, part_data);
-}
-
-void Obstacle::FillMFObjectFull(Room* room, Human* hum, cs::MFObjectFull* full_data)
-{
-    PBUtils::Obstacle_FillMFObjectFull(this, room, hum, full_data);
-}
-
 void Obstacle::GetAabbBox(AabbCollider& aabb_box)
 {
     if (self_collider2_) {
diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc
index d2d090bb..27e27d2c 100644
--- a/server/gameserver/pbutils.cc
+++ b/server/gameserver/pbutils.cc
@@ -16,6 +16,7 @@
 #include "hero.h"
 #include "loot.h"
 #include "obstacle.h"
+#include "roomobstacle.h"
 #include "skill.h"
 #include "skin.h"
 #include "typeconvert.h"
@@ -24,6 +25,7 @@
 #include "mt/Buff.h"
 #include "mt/Equip.h"
 #include "mt/Hero.h"
+#include "mt/MapThing.h"
 
 void PBUtils::Ability_FillMFAttrAdditionList(Ability* self, Human* hum, cs::MFActivePlayerData* player_data)
 {
@@ -302,9 +304,8 @@ void Loot::FillMFObjectFull(Room* room, Human* hum, cs::MFObjectFull* full_data)
     }
 }
 
-void PBUtils::Obstacle_FillMFObjectPart(Obstacle* self, Room* room, Human* hum, cs::MFObjectPart* part_data)
+void Obstacle::FillMFObjectPart(Room* room, Human* hum, cs::MFObjectPart* part_data)
 {
-    #if 0
     part_data->set_object_type(ET_Obstacle);
     cs::MFObstaclePart* p = part_data->mutable_union_obj_2();
     p->set_obj_uniid(GetUniId());
@@ -312,12 +313,10 @@ void PBUtils::Obstacle_FillMFObjectPart(Obstacle* self, Room* room, Human* hum,
     if (std::abs(scale - 1.0f) > 0.00001f) {
         p->set_scale(scale);
     }
-    #endif
 }
 
-void PBUtils::Obstacle_FillMFObjectFull(Obstacle* self, Room* room, Human* hum, cs::MFObjectFull* full_data)
+void Obstacle::FillMFObjectFull(Room* room, Human* hum, cs::MFObjectFull* full_data)
 {
-    #if 0
     full_data->set_object_type(ET_Obstacle);
     if (IsClientCached(hum)) {
         int object_flags = 0;
@@ -385,7 +384,6 @@ void PBUtils::Obstacle_FillMFObjectFull(Obstacle* self, Room* room, Human* hum,
     if (meta->thing_type() == kObstacleStrengthenWall) {
         p->set_rotate(rotate_ * 180);
     }
-    #endif
 }
 
 void PBUtils::Skill_FillMFSkill(Skill* self, cs::MFSkill* skill_pb)