diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-07-13 11:09:19 +0200 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-07-13 11:09:19 +0200 |
| commit | e48d172f49e9aeb9b73b49f54e0be4af3e14b9db (patch) | |
| tree | 88fbd34759f5e007c8a01acb8df9ee2b6985858e /src/BlockArea.cpp | |
| parent | Changed BroadcastSoundEffect function to take floating pos. (diff) | |
| parent | Merge pull request #1167 from Howaner/Plugins (diff) | |
| download | cuberite-e48d172f49e9aeb9b73b49f54e0be4af3e14b9db.tar cuberite-e48d172f49e9aeb9b73b49f54e0be4af3e14b9db.tar.gz cuberite-e48d172f49e9aeb9b73b49f54e0be4af3e14b9db.tar.bz2 cuberite-e48d172f49e9aeb9b73b49f54e0be4af3e14b9db.tar.lz cuberite-e48d172f49e9aeb9b73b49f54e0be4af3e14b9db.tar.xz cuberite-e48d172f49e9aeb9b73b49f54e0be4af3e14b9db.tar.zst cuberite-e48d172f49e9aeb9b73b49f54e0be4af3e14b9db.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; |