1

server/gameserver/mapcollider.cc

@@ -126,7 +126,7 @@ namespace mc
                          {
                              node->name
                          });
-                    childs[node->name] = node;
+                    childs[a8::Format("%s_%d", {node->name, i + 1})] = node;
                     #else
                     A8_ABORT();
                     #endif

server/gameserver/mapservice.cc

@@ -196,7 +196,9 @@ void MapService::AddTriangle(mc::Triangle* tri)
             //A8_ABORT();
         }
         if (max_grid_y >= map_height_) {
+            #if 0
             A8_ABORT();
+            #endif
             max_grid_y = map_height_ - 1;
         }
         float tri_verts[3 * 3];

server/gameserver/mt/MapCollider.cc

@@ -29,14 +29,22 @@ namespace mt
     void MapCollider::LoadAll()
     {
         std::vector<std::string> files = {
+#ifdef DEBUG
+            "main3d_map.colliders.new.json"
+#else
             "main3d_map.colliders.json"
+#endif
         };
         for (auto& filename : files) {
             MapCollider* p = new MapCollider();
             p->Load(filename);
             p->LoadTerrain("map4_terrain.bin");
             raw_list.push_back(p);
+#ifdef DEBUG
+            name_hash["main3d_map.colliders.json"] = p;
+#else
             name_hash[filename] = p;
+#endif
         }
     }