summaryrefslogtreecommitdiffstats
path: root/src/BlockArea.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-07-13 11:02:28 +0200
committerMattes D <github@xoft.cz>2014-07-13 11:02:28 +0200
commit398cead1f34c2ea0003345d15c2610412f5c997b (patch)
tree3a9f3388b59661cbb7d6f2ddb86cd2a4db29b8c7 /src/BlockArea.cpp
parentOnly one instance of server can be started (diff)
parentFixed wrong types. (BLOCKTYPE -> NIBBLETYPE) (diff)
downloadcuberite-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.cpp2
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;