Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / map.cpp

diff --git a/src/map.cpp b/src/map.cpp
index 213844d5759e3a4e731553ad0ffe411bd8247ef7..cb63d258339423c1283547ae854709cee10cad27 100644 (file)
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -139,6 +139,21 @@ MapBlock * Map::getBlockNoCreate(v3s16 p3d)
        return block;
 }
 
+void Map::listAllLoadedBlocks(std::vector<v3s16> &dst)
+{
+       for (auto &sector_it : m_sectors) {
+               MapSector *sector = sector_it.second;
+
+               MapBlockVect blocks;
+               sector->getBlocks(blocks);
+
+               for (MapBlock *block : blocks) {
+                       v3s16 p = block->getPos();
+                       dst.push_back(p);
+               }
+       }
+}
+
 bool Map::isValidPosition(v3s16 p)
 {
        v3s16 blockpos = getNodeBlockPos(p);
@@ -1693,21 +1708,6 @@ void ServerMap::listAllLoadableBlocks(std::vector<v3s16> &dst)
                dbase_ro->listAllLoadableBlocks(dst);
 }
 
-void ServerMap::listAllLoadedBlocks(std::vector<v3s16> &dst)
-{
-       for (auto &sector_it : m_sectors) {
-               MapSector *sector = sector_it.second;
-
-               MapBlockVect blocks;
-               sector->getBlocks(blocks);
-
-               for (MapBlock *block : blocks) {
-                       v3s16 p = block->getPos();
-                       dst.push_back(p);
-               }
-       }
-}
-
 MapDatabase *ServerMap::createDatabase(
        const std::string &name,
        const std::string &savedir,