diff options
| author | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-21 14:32:40 +0100 |
|---|---|---|
| committer | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-21 14:32:40 +0100 |
| commit | 779aca60511055832e776ab4a6299a2b7e049a16 (patch) | |
| tree | dfb031e9bd01b25ab0199286cf6e660f26489817 /src/BlockArea.cpp | |
| parent | Merge branch 'master' into cmake (diff) | |
| parent | Merge branch 'master', remote-tracking branch 'upstream/master' (diff) | |
| download | cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar.gz cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar.bz2 cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar.lz cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar.xz cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar.zst cuberite-779aca60511055832e776ab4a6299a2b7e049a16.zip | |
Diffstat (limited to 'src/BlockArea.cpp')
| -rw-r--r-- | src/BlockArea.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/BlockArea.cpp b/src/BlockArea.cpp index c9443c702..a5309f995 100644 --- a/src/BlockArea.cpp +++ b/src/BlockArea.cpp @@ -131,7 +131,7 @@ static void MergeCombinatorLake(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBB case E_BLOCK_STATIONARY_LAVA: { a_DstType = a_SrcType; - a_DstMeta = a_DstMeta; + a_DstMeta = a_SrcMeta; return; } } @@ -820,7 +820,6 @@ void cBlockArea::RelLine(int a_RelX1, int a_RelY1, int a_RelZ1, int a_RelX2, int int sx = (a_RelX1 < a_RelX2) ? 1 : -1; int sy = (a_RelY1 < a_RelY2) ? 1 : -1; int sz = (a_RelZ1 < a_RelZ2) ? 1 : -1; - int err = dx - dz; if (dx >= std::max(dy, dz)) // x dominant { |