From 3a41ec842853274c78c613a2417ea5abda37bee4 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Fri, 26 Mar 2021 20:17:57 +0800
Subject: [PATCH] 1

---
 server/gameserver/mapinstance.cc | 5 +++--
 server/gameserver/metamgr.cc     | 6 +++---
 server/gameserver/metamgr.h      | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/server/gameserver/mapinstance.cc b/server/gameserver/mapinstance.cc
index cb2c293..77294ba 100644
--- a/server/gameserver/mapinstance.cc
+++ b/server/gameserver/mapinstance.cc
@@ -153,9 +153,10 @@ void MapInstance::CreateThings()
 void MapInstance::CreateTerrain()
 {
     metatable::TerrainJson* terrain = MetaMgr::Instance()->GetTerrainJson(map_id);
-    std::list<metatable::MapLayerJson>* layers = MetaMgr::Instance()->GetMapLayer(map_tpl_name_);
+    std::list<metatable::MapLayerJson>* layers = MetaMgr::Instance()->GetMapLayer(map_meta_->i->map_pic());
     if (!terrain || !layers) {
-        abort();
+        return;
+        //abort();
     }
     if (layers->empty()) {
         return;
diff --git a/server/gameserver/metamgr.cc b/server/gameserver/metamgr.cc
index 181acc6..9bfcb28 100755
--- a/server/gameserver/metamgr.cc
+++ b/server/gameserver/metamgr.cc
@@ -468,7 +468,7 @@ private:
                                 itr->second.clear();
                             }
                             std::string filename = res_path + "map" + meta.map_pic() + ".layers.json";
-                            if (access("test.c", F_OK) != -1) {
+                            if (access(filename.c_str(), F_OK) != -1) {
                                 f8::ReadJsonMetaFile(filename, itr->second);
                             }
                         }
@@ -753,7 +753,7 @@ MetaData::SafeArea* MetaMgr::GetSafeArea(int area_id)
     return itr != loader_->safearea_hash.end() ? itr->second : nullptr;
 }
 
-std::vector<MetaData::MapTplThing>* MetaMgr::GetMapTplThing(std::string& map_name)
+std::vector<MetaData::MapTplThing>* MetaMgr::GetMapTplThing(const std::string& map_name)
 {
     auto itr = loader_->maptpl_hash.find(map_name);
     return itr != loader_->maptpl_hash.end() ? &itr->second : nullptr;
@@ -769,7 +769,7 @@ metatable::TerrainJson* MetaMgr::GetTerrainJson(int map_id)
     return nullptr;
 }
 
-std::list<metatable::MapLayerJson>* MetaMgr::GetMapLayer(std::string& map_name)
+std::list<metatable::MapLayerJson>* MetaMgr::GetMapLayer(const std::string& map_name)
 {
     auto itr = loader_->layer_meta_hash.find(map_name);
     return itr != loader_->layer_meta_hash.end() ? &itr->second : nullptr;
diff --git a/server/gameserver/metamgr.h b/server/gameserver/metamgr.h
index 779bf89..5ec8475 100755
--- a/server/gameserver/metamgr.h
+++ b/server/gameserver/metamgr.h
@@ -31,9 +31,9 @@ class MetaMgr : public a8::Singleton<MetaMgr>
     MetaData::Building* GetBuilding(int building_id);
     MetaData::Drop* GetDrop(int drop_id);
     MetaData::SafeArea* GetSafeArea(int area_id);
-    std::vector<MetaData::MapTplThing>* GetMapTplThing(std::string& map_name);
+    std::vector<MetaData::MapTplThing>* GetMapTplThing(const std::string& map_name);
     metatable::TerrainJson* GetTerrainJson(int map_id);
-    std::list<metatable::MapLayerJson>* GetMapLayer(std::string& map_name);
+    std::list<metatable::MapLayerJson>* GetMapLayer(const std::string& map_name);
     std::list<MetaData::AirDrop>& GetAirDrops();
     MetaData::AirDrop* GetAirDrop(int airdrop_id);
     MetaData::AirLine* RandAirLine(int map_id);