diff options
author | Mattes D <github@xoft.cz> | 2014-07-13 11:02:28 +0200 |
---|---|---|
committer | Mattes D <github@xoft.cz> | 2014-07-13 11:02:28 +0200 |
commit | 398cead1f34c2ea0003345d15c2610412f5c997b (patch) | |
tree | 3a9f3388b59661cbb7d6f2ddb86cd2a4db29b8c7 /src/BlockArea.cpp | |
parent | Only one instance of server can be started (diff) | |
parent | Fixed wrong types. (BLOCKTYPE -> NIBBLETYPE) (diff) | |
download | cuberite-398cead1f34c2ea0003345d15c2610412f5c997b.tar cuberite-398cead1f34c2ea0003345d15c2610412f5c997b.tar.gz cuberite-398cead1f34c2ea0003345d15c2610412f5c997b.tar.bz2 cuberite-398cead1f34c2ea0003345d15c2610412f5c997b.tar.lz cuberite-398cead1f34c2ea0003345d15c2610412f5c997b.tar.xz cuberite-398cead1f34c2ea0003345d15c2610412f5c997b.tar.zst cuberite-398cead1f34c2ea0003345d15c2610412f5c997b.zip |
Diffstat (limited to 'src/BlockArea.cpp')
-rw-r--r-- | src/BlockArea.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/BlockArea.cpp b/src/BlockArea.cpp index 185582ba3..0e4c42f0f 100644 --- a/src/BlockArea.cpp +++ b/src/BlockArea.cpp @@ -59,7 +59,7 @@ void InternalMergeBlocks( } else { - BLOCKTYPE FakeDestMeta = 0; + NIBBLETYPE FakeDestMeta = 0; Combinator(a_DstTypes[DstIdx], a_SrcTypes[SrcIdx], FakeDestMeta, (NIBBLETYPE)0); } ++DstIdx; |