flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed a typo in cBlockArea merging code.

Browse Source
This commit is contained in:
madmaxoft 2013-12-20 16:48:45 +01:00
parent d6de11da07
commit fc97cb8c58
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/BlockArea.cpp
View File

@ -131,7 +131,7 @@ static void MergeCombinatorLake(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBB
case E_BLOCK_STATIONARY_LAVA: case E_BLOCK_STATIONARY_LAVA:
{ {
a_DstType = a_SrcType; a_DstType = a_SrcType;
a_DstMeta = a_DstMeta; a_DstMeta = a_SrcMeta;
return; 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 sx = (a_RelX1 < a_RelX2) ? 1 : -1;
int sy = (a_RelY1 < a_RelY2) ? 1 : -1; int sy = (a_RelY1 < a_RelY2) ? 1 : -1;
int sz = (a_RelZ1 < a_RelZ2) ? 1 : -1; int sz = (a_RelZ1 < a_RelZ2) ? 1 : -1;
int err = dx - dz;
if (dx >= std::max(dy, dz)) // x dominant if (dx >= std::max(dy, dz)) // x dominant
{ {