* fix automerge regression

[dragonfireclient.git] / src / voxel.h

diff --git a/src/voxel.h b/src/voxel.h
index 2e8015eb19c72dee159458b2902d45fff13889f2..6d1a318f1e9b9f505d1a849d150806664cc67b14 100644 (file)
--- a/src/voxel.h
+++ b/src/voxel.h
@@ -384,6 +384,14 @@ class VoxelManipulator /*: public NodeContainer*/
 
                return m_data[m_area.index(p)];
        }
+       MapNode getNodeNoExNoEmerge(v3s16 p)
+       {
+               if(m_area.contains(p) == false)
+                       return MapNode(CONTENT_IGNORE);
+               if(m_flags[m_area.index(p)] & VOXELFLAG_INEXISTENT)
+                       return MapNode(CONTENT_IGNORE);
+               return m_data[m_area.index(p)];
+       }
        MapNode & getNodeRef(v3s16 p)
        {
                emerge(p);