From 2ce87e13a564af825ca834301b26960d42b6f794 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sun, 26 Mar 2023 20:05:13 +0800
Subject: [PATCH] 1

---
 server/gameserver/mapinstance.cc | 27 ++-------------------------
 server/gameserver/mapinstance.h  |  7 -------
 server/gameserver/room.cc        |  3 ---
 3 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/server/gameserver/mapinstance.cc b/server/gameserver/mapinstance.cc
index 68d041cb..6c6410bd 100644
--- a/server/gameserver/mapinstance.cc
+++ b/server/gameserver/mapinstance.cc
@@ -92,16 +92,11 @@ void MapInstance::Init()
     map_service_->Init(map_meta_->map_width() / MAP_GRID_WIDTH,
                        map_meta_->map_height() / MAP_GRID_WIDTH,
                        MAP_GRID_WIDTH);
-    CreateThings();
     f8::UdpLog::Instance()->Info
-        ("map_id:%d current_uniid:%d ",
+        ("map_id:%d",
          {
-          map_id,
-          current_uniid_,
+          map_id
          });
-    if (current_uniid_ >= FIXED_OBJECT_MAXID) {
-        A8_ABORT();
-    }
     {
         navmesh_ = dtAllocNavMesh();
         FILE *fp = fopen((mt::MetaMgr::Instance()->GetResDir() + "map4.bin").c_str(), "rb");
@@ -208,24 +203,6 @@ void MapInstance::AttachRoom(Room* room, RoomInitInfo& init_info)
     init_info.map_instance = shared_from_this();
 }
 
-void MapInstance::CreateThings()
-{
-    map_tpl_name_ = map_meta_->RandTemplate();
-}
-
-Entity* MapInstance::GetEntityByUniId(int uniid)
-{
-    auto itr = uniid_hash_.find(uniid);
-    return itr != uniid_hash_.end() ? itr->second : nullptr;
-}
-
-int MapInstance::AllocUniid()
-{
-    while (GetEntityByUniId(++current_uniid_) || current_uniid_ == 0) {
-    }
-    return current_uniid_;
-}
-
 int MapInstance::FindStraightPath(
                                   const glm::vec3& start,
                                   const glm::vec3& end,
diff --git a/server/gameserver/mapinstance.h b/server/gameserver/mapinstance.h
index 70606264..3e1355cc 100644
--- a/server/gameserver/mapinstance.h
+++ b/server/gameserver/mapinstance.h
@@ -16,7 +16,6 @@ struct HouseInfo
     std::vector<float> verts;
 };
 
-class Entity;
 class Obstacle;
 class MapService;
 class GridService;
@@ -33,7 +32,6 @@ class MapInstance : public std::enable_shared_from_this<MapInstance>
     void AttachRoom(Room* room, RoomInitInfo& init_info);
     const mt::Map* GetMapMeta() { return map_meta_; };
     std::vector<int>& GetPolyExtDatas() { return poly_ext_datas_; };
-    Entity* GetEntityByUniId(int uniid);
 
     dtNavMesh* GetNavMesh() { return navmesh_; };
     dtNavMeshQuery* GetNavMeshQuery() { return navmesh_query_; };
@@ -61,9 +59,7 @@ class MapInstance : public std::enable_shared_from_this<MapInstance>
                       glm::vec3& hit_pos, float& ray_length);
 
  private:
-    void CreateThings();
     void LoadHouse();
-    int AllocUniid();
     void MarkMapAreaPolys();
 
  private:
@@ -74,9 +70,6 @@ class MapInstance : public std::enable_shared_from_this<MapInstance>
     float hit_pos_[3];
     dtPolyRef polys_[MAX_POLYS];
 
-    int current_uniid_ = 0;
-    std::map<int, Entity*> uniid_hash_;
-
     std::vector<int> poly_ext_datas_;
 
     std::list<HouseInfo> houses_;
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index df92e215..9c9e25fe 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -237,9 +237,6 @@ Player* Room::GetPlayerByUniId(int uniid)
 
 Entity* Room::GetEntityByUniId(int uniid)
 {
-    if (uniid < FIXED_OBJECT_MAXID) {
-        return map_instance->GetEntityByUniId(uniid);
-    }
     auto itr = uniid_hash_.find(uniid);
     return itr != uniid_hash_.end() ? itr->second : nullptr;
 }