diff options
| author | Raekye <adrian@creatifcubed.com> | 2015-01-26 01:13:55 +0100 |
|---|---|---|
| committer | Raekye <adrian@creatifcubed.com> | 2015-01-26 01:13:55 +0100 |
| commit | 82a10116ddc60ecf1fac33ee89c0c234a80b5cfb (patch) | |
| tree | b2dcbc83c9e1144e5cfad602ad5ccbe706904302 | |
| parent | filter out leaves meta changes from being sent to the client (diff) | |
| download | cuberite-82a10116ddc60ecf1fac33ee89c0c234a80b5cfb.tar cuberite-82a10116ddc60ecf1fac33ee89c0c234a80b5cfb.tar.gz cuberite-82a10116ddc60ecf1fac33ee89c0c234a80b5cfb.tar.bz2 cuberite-82a10116ddc60ecf1fac33ee89c0c234a80b5cfb.tar.lz cuberite-82a10116ddc60ecf1fac33ee89c0c234a80b5cfb.tar.xz cuberite-82a10116ddc60ecf1fac33ee89c0c234a80b5cfb.tar.zst cuberite-82a10116ddc60ecf1fac33ee89c0c234a80b5cfb.zip | |
| -rw-r--r-- | src/Chunk.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/Chunk.cpp b/src/Chunk.cpp index f5a1f9900..a4198c322 100644 --- a/src/Chunk.cpp +++ b/src/Chunk.cpp @@ -1573,13 +1573,15 @@ void cChunk::FastSetBlock(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_BlockT !( // ... the old and new blocktypes AREN'T leaves (because the client doesn't need meta updates) ((OldBlockType == E_BLOCK_LEAVES) && (a_BlockType == E_BLOCK_LEAVES)) || ((OldBlockType == E_BLOCK_NEW_LEAVES) && (a_BlockType == E_BLOCK_NEW_LEAVES)) - ) || // ... OR ... - (OldBlockMeta != a_BlockMeta) || // ... the meta value is different OR ... - !( // ... the old and new blocktypes AREN'T liquids (because client doesn't need to distinguish betwixt them): - ((OldBlockType == E_BLOCK_STATIONARY_WATER) && (a_BlockType == E_BLOCK_WATER)) || // Replacing stationary water with water - ((OldBlockType == E_BLOCK_WATER) && (a_BlockType == E_BLOCK_STATIONARY_WATER)) || // Replacing water with stationary water - ((OldBlockType == E_BLOCK_STATIONARY_LAVA) && (a_BlockType == E_BLOCK_LAVA)) || // Replacing stationary water with water - ((OldBlockType == E_BLOCK_LAVA) && (a_BlockType == E_BLOCK_STATIONARY_LAVA)) // Replacing water with stationary water + ) && // ... AND ... + ( + (OldBlockMeta != a_BlockMeta) || // ... the meta value is different OR ... + !( // ... the old and new blocktypes AREN'T liquids (because client doesn't need to distinguish betwixt them): + ((OldBlockType == E_BLOCK_STATIONARY_WATER) && (a_BlockType == E_BLOCK_WATER)) || // Replacing stationary water with water + ((OldBlockType == E_BLOCK_WATER) && (a_BlockType == E_BLOCK_STATIONARY_WATER)) || // Replacing water with stationary water + ((OldBlockType == E_BLOCK_STATIONARY_LAVA) && (a_BlockType == E_BLOCK_LAVA)) || // Replacing stationary water with water + ((OldBlockType == E_BLOCK_LAVA) && (a_BlockType == E_BLOCK_STATIONARY_LAVA)) // Replacing water with stationary water + ) ) ) ) |