diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-05-23 16:02:55 +0200 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-05-23 16:02:55 +0200 |
| commit | 5a76eab4c0ff309886cb407ba6b9d84516db11ff (patch) | |
| tree | 51997884fc6c7407b1737dee014f94cea977b57a /src/BlockArea.cpp | |
| parent | Added callback for stopping starvation mode (diff) | |
| parent | Ignore CTest files (diff) | |
| download | cuberite-5a76eab4c0ff309886cb407ba6b9d84516db11ff.tar cuberite-5a76eab4c0ff309886cb407ba6b9d84516db11ff.tar.gz cuberite-5a76eab4c0ff309886cb407ba6b9d84516db11ff.tar.bz2 cuberite-5a76eab4c0ff309886cb407ba6b9d84516db11ff.tar.lz cuberite-5a76eab4c0ff309886cb407ba6b9d84516db11ff.tar.xz cuberite-5a76eab4c0ff309886cb407ba6b9d84516db11ff.tar.zst cuberite-5a76eab4c0ff309886cb407ba6b9d84516db11ff.zip | |
Diffstat (limited to 'src/BlockArea.cpp')
| -rw-r--r-- | src/BlockArea.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/BlockArea.cpp b/src/BlockArea.cpp index 5e41b135c..abbfca767 100644 --- a/src/BlockArea.cpp +++ b/src/BlockArea.cpp @@ -9,7 +9,7 @@ #include "OSSupport/GZipFile.h" #include "Blocks/BlockHandler.h" #include "Cuboid.h" -#include "ChunkBuffer.h" +#include "ChunkData.h" @@ -1835,10 +1835,10 @@ bool cBlockArea::cChunkReader::Coords(int a_ChunkX, int a_ChunkZ) -void cBlockArea::cChunkReader::ChunkBuffer(const cChunkBuffer & a_BlockBuffer) +void cBlockArea::cChunkReader::ChunkData(const cChunkData & a_BlockBuffer) { { - if (!(m_Area.m_BlockTypes == NULL)) + if (m_Area.m_BlockTypes != NULL) { int SizeY = m_Area.m_Size.y; int MinY = m_Origin.y; @@ -1901,17 +1901,17 @@ void cBlockArea::cChunkReader::ChunkBuffer(const cChunkBuffer & a_BlockBuffer) } } - if (m_Area.m_BlockMetas) + if (m_Area.m_BlockMetas != NULL) { a_BlockBuffer.CopyMeta(m_Area.m_BlockMetas); } - if (m_Area.m_BlockLight) + if (m_Area.m_BlockLight != NULL) { a_BlockBuffer.CopyLight(m_Area.m_BlockLight); } - if (m_Area.m_BlockSkyLight) + if (m_Area.m_BlockSkyLight != NULL) { a_BlockBuffer.CopySkyLight(m_Area.m_BlockSkyLight); } |