From 6d9f77e14f5a582dad766f96367819dbdebb127c Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Thu, 25 Mar 2021 13:31:59 +0800
Subject: [PATCH] 1

---
 server/gameserver/metamgr.cc | 6 +++---
 server/gameserver/metamgr.h  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/gameserver/metamgr.cc b/server/gameserver/metamgr.cc
index 59274df..47fa777 100755
--- a/server/gameserver/metamgr.cc
+++ b/server/gameserver/metamgr.cc
@@ -76,7 +76,7 @@ public:
     std::map<int, MetaData::Building*> building_hash;
     std::map<int, MetaData::Drop*> drop_hash;
     std::map<std::string, std::list<metatable::MapTplThingJson>> maptpl_meta_hash;
-    std::map<std::string, std::list<metatable::TerrainJson>> terrain_meta_hash;
+    std::map<int, metatable::TerrainJson> terrain_meta_hash;
     std::map<std::string, std::list<metatable::MapLayerJson>> layer_meta_hash;
     std::map<std::string, std::vector<MetaData::MapTplThing>> maptpl_hash;
     std::map<int, MetaData::Dress*> dress_hash;
@@ -740,9 +740,9 @@ std::vector<MetaData::MapTplThing>* MetaMgr::GetMapTplThing(std::string& map_nam
     return itr != loader_->maptpl_hash.end() ? &itr->second : nullptr;
 }
 
-std::list<metatable::TerrainJson>* MetaMgr::GetTerrainJson(std::string& map_name)
+metatable::TerrainJson* MetaMgr::GetTerrainJson(int map_id)
 {
-    auto itr = loader_->terrain_meta_hash.find(map_name);
+    auto itr = loader_->terrain_meta_hash.find(map_id);
     return itr != loader_->terrain_meta_hash.end() ? &itr->second : nullptr;
 }
 
diff --git a/server/gameserver/metamgr.h b/server/gameserver/metamgr.h
index 5960f57..779bf89 100755
--- a/server/gameserver/metamgr.h
+++ b/server/gameserver/metamgr.h
@@ -32,7 +32,7 @@ class MetaMgr : public a8::Singleton<MetaMgr>
     MetaData::Drop* GetDrop(int drop_id);
     MetaData::SafeArea* GetSafeArea(int area_id);
     std::vector<MetaData::MapTplThing>* GetMapTplThing(std::string& map_name);
-    std::list<metatable::TerrainJson>* GetTerrainJson(std::string& map_name);
+    metatable::TerrainJson* GetTerrainJson(int map_id);
     std::list<metatable::MapLayerJson>* GetMapLayer(std::string& map_name);
     std::list<MetaData::AirDrop>& GetAirDrops();
     MetaData::AirDrop* GetAirDrop(int airdrop_id);