summaryrefslogtreecommitdiffstats
path: root/src/BlockArea.cpp
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-07-13 00:51:42 +0200
committerHowaner <franzi.moos@googlemail.com>2014-07-13 00:51:42 +0200
commit905fed09a64667f6f9cebf353dc65e6f094fbc72 (patch)
tree4cf05d8bb6b94461373d1442bfe284820ebf2b91 /src/BlockArea.cpp
parentMerge pull request #1154 from mc-server/trappedchests (diff)
downloadcuberite-905fed09a64667f6f9cebf353dc65e6f094fbc72.tar
cuberite-905fed09a64667f6f9cebf353dc65e6f094fbc72.tar.gz
cuberite-905fed09a64667f6f9cebf353dc65e6f094fbc72.tar.bz2
cuberite-905fed09a64667f6f9cebf353dc65e6f094fbc72.tar.lz
cuberite-905fed09a64667f6f9cebf353dc65e6f094fbc72.tar.xz
cuberite-905fed09a64667f6f9cebf353dc65e6f094fbc72.tar.zst
cuberite-905fed09a64667f6f9cebf353dc65e6f094fbc72.zip
Diffstat (limited to '')
-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;