diff options
| author | Mattes D <github@xoft.cz> | 2015-03-23 12:25:22 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2015-03-23 12:25:22 +0100 |
| commit | f1ef7f57ff76e9d321276059454950297d5a6a39 (patch) | |
| tree | db230dbd9bdf920f6553b6ef59d1bae286b7918c /src/Simulator | |
| parent | Merge pull request #1792 from mc-server/APIDocs (diff) | |
| parent | Correct world height validations. (diff) | |
| download | cuberite-f1ef7f57ff76e9d321276059454950297d5a6a39.tar cuberite-f1ef7f57ff76e9d321276059454950297d5a6a39.tar.gz cuberite-f1ef7f57ff76e9d321276059454950297d5a6a39.tar.bz2 cuberite-f1ef7f57ff76e9d321276059454950297d5a6a39.tar.lz cuberite-f1ef7f57ff76e9d321276059454950297d5a6a39.tar.xz cuberite-f1ef7f57ff76e9d321276059454950297d5a6a39.tar.zst cuberite-f1ef7f57ff76e9d321276059454950297d5a6a39.zip | |
Diffstat (limited to 'src/Simulator')
| -rw-r--r-- | src/Simulator/FireSimulator.cpp | 2 | ||||
| -rw-r--r-- | src/Simulator/IncrementalRedstoneSimulator.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Simulator/FireSimulator.cpp b/src/Simulator/FireSimulator.cpp index 8456ed11d..0ee33a3bc 100644 --- a/src/Simulator/FireSimulator.cpp +++ b/src/Simulator/FireSimulator.cpp @@ -377,7 +377,7 @@ void cFireSimulator::RemoveFuelNeighbors(cChunk * a_Chunk, int a_RelX, int a_Rel if (BlockType == E_BLOCK_TNT) { m_World.SpawnPrimedTNT(AbsX, Y, AbsZ, 0); - Neighbour->SetBlock(X, a_RelY + Y, Z, E_BLOCK_AIR, 0); + Neighbour->SetBlock(X, Y, Z, E_BLOCK_AIR, 0); return; } diff --git a/src/Simulator/IncrementalRedstoneSimulator.cpp b/src/Simulator/IncrementalRedstoneSimulator.cpp index 1cc5340dd..40be9c582 100644 --- a/src/Simulator/IncrementalRedstoneSimulator.cpp +++ b/src/Simulator/IncrementalRedstoneSimulator.cpp @@ -31,7 +31,7 @@ void cIncrementalRedstoneSimulator::RedstoneAddBlock(int a_BlockX, int a_BlockY, { return; } - else if ((a_BlockY < 0) || (a_BlockY > cChunkDef::Height)) + else if ((a_BlockY < 0) || (a_BlockY >= cChunkDef::Height)) { return; } @@ -556,7 +556,7 @@ void cIncrementalRedstoneSimulator::HandleRedstoneWire(int a_RelBlockX, int a_Re if ((i >= 4) && (i <= 7)) // If we are currently checking for wire surrounding ourself one block above... { BLOCKTYPE Type = 0; - if (a_RelBlockY + 1 >= cChunkDef::Height) + if (a_RelBlockY >= cChunkDef::Height - 1) { continue; } |