summaryrefslogtreecommitdiffstats
path: root/src/Simulator
diff options
context:
space:
mode:
authorTommy Santerre <tommy.santerre@gmail.com>2015-02-14 23:11:38 +0100
committerTommy Santerre <tommy.santerre@gmail.com>2015-03-20 01:32:17 +0100
commit3f6d823aa41f1a7641fb686cf24561b0aca95798 (patch)
treea695c90473a2de9ebd4fb91b9716b97d8ab929be /src/Simulator
parentAPIDump: Added inheritance checking. (diff)
downloadcuberite-3f6d823aa41f1a7641fb686cf24561b0aca95798.tar
cuberite-3f6d823aa41f1a7641fb686cf24561b0aca95798.tar.gz
cuberite-3f6d823aa41f1a7641fb686cf24561b0aca95798.tar.bz2
cuberite-3f6d823aa41f1a7641fb686cf24561b0aca95798.tar.lz
cuberite-3f6d823aa41f1a7641fb686cf24561b0aca95798.tar.xz
cuberite-3f6d823aa41f1a7641fb686cf24561b0aca95798.tar.zst
cuberite-3f6d823aa41f1a7641fb686cf24561b0aca95798.zip
Diffstat (limited to '')
-rw-r--r--src/Simulator/FireSimulator.cpp2
-rw-r--r--src/Simulator/IncrementalRedstoneSimulator.cpp4
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;
}