diff options
| author | madmaxoft <github@xoft.cz> | 2013-12-20 16:48:45 +0100 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2013-12-20 16:48:45 +0100 |
| commit | fc97cb8c584fffec0621603be8e89282d039c23f (patch) | |
| tree | 4625aec95c888b165b9cef809516e0445987ab1a /src/BlockArea.cpp | |
| parent | Sorted a few constructors to remove warnings. (diff) | |
| download | cuberite-fc97cb8c584fffec0621603be8e89282d039c23f.tar cuberite-fc97cb8c584fffec0621603be8e89282d039c23f.tar.gz cuberite-fc97cb8c584fffec0621603be8e89282d039c23f.tar.bz2 cuberite-fc97cb8c584fffec0621603be8e89282d039c23f.tar.lz cuberite-fc97cb8c584fffec0621603be8e89282d039c23f.tar.xz cuberite-fc97cb8c584fffec0621603be8e89282d039c23f.tar.zst cuberite-fc97cb8c584fffec0621603be8e89282d039c23f.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 { |