diff options
| author | madmaxoft <github@xoft.cz> | 2014-05-05 20:33:21 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2014-05-05 20:33:50 +0200 |
| commit | b69a0c914e7a5a5f970bb98831592b2b417c4de8 (patch) | |
| tree | bba6adba6faa862bad230bb5bbf8177c356683d8 /src | |
| parent | Merge pull request #978 from mc-server/VectorAssignmentOperator (diff) | |
| download | cuberite-b69a0c914e7a5a5f970bb98831592b2b417c4de8.tar cuberite-b69a0c914e7a5a5f970bb98831592b2b417c4de8.tar.gz cuberite-b69a0c914e7a5a5f970bb98831592b2b417c4de8.tar.bz2 cuberite-b69a0c914e7a5a5f970bb98831592b2b417c4de8.tar.lz cuberite-b69a0c914e7a5a5f970bb98831592b2b417c4de8.tar.xz cuberite-b69a0c914e7a5a5f970bb98831592b2b417c4de8.tar.zst cuberite-b69a0c914e7a5a5f970bb98831592b2b417c4de8.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/BlockArea.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/BlockArea.cpp b/src/BlockArea.cpp index e0ae2c5b6..897af27c4 100644 --- a/src/BlockArea.cpp +++ b/src/BlockArea.cpp @@ -707,11 +707,11 @@ void cBlockArea::Merge(const cBlockArea & a_Src, int a_RelX, int a_RelY, int a_R if (IsDummyMetas) { - MergeByStrategy<true>(a_Src, a_RelX, a_RelY, a_RelZ, a_Strategy, SrcMetas, DstMetas); + MergeByStrategy<false>(a_Src, a_RelX, a_RelY, a_RelZ, a_Strategy, SrcMetas, DstMetas); } else { - MergeByStrategy<false>(a_Src, a_RelX, a_RelY, a_RelZ, a_Strategy, SrcMetas, DstMetas); + MergeByStrategy<true>(a_Src, a_RelX, a_RelY, a_RelZ, a_Strategy, SrcMetas, DstMetas); } } |