summaryrefslogtreecommitdiffstats
path: root/src/Simulator/FireSimulator.cpp
diff options
context:
space:
mode:
authorSamuel Barney <samjbarney@gmail.com>2013-12-05 18:01:23 +0100
committerSamuel Barney <samjbarney@gmail.com>2013-12-05 18:01:23 +0100
commitd62bfdaca4eb29678c5a82ff69e35965d7007640 (patch)
tree11b1df8b1322dc9da80d383a07f15d5a0cb978e6 /src/Simulator/FireSimulator.cpp
parentFinished Merge (diff)
downloadcuberite-d62bfdaca4eb29678c5a82ff69e35965d7007640.tar
cuberite-d62bfdaca4eb29678c5a82ff69e35965d7007640.tar.gz
cuberite-d62bfdaca4eb29678c5a82ff69e35965d7007640.tar.bz2
cuberite-d62bfdaca4eb29678c5a82ff69e35965d7007640.tar.lz
cuberite-d62bfdaca4eb29678c5a82ff69e35965d7007640.tar.xz
cuberite-d62bfdaca4eb29678c5a82ff69e35965d7007640.tar.zst
cuberite-d62bfdaca4eb29678c5a82ff69e35965d7007640.zip
Diffstat (limited to 'src/Simulator/FireSimulator.cpp')
-rw-r--r--src/Simulator/FireSimulator.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/Simulator/FireSimulator.cpp b/src/Simulator/FireSimulator.cpp
index 8e46ed320..03e4f6e45 100644
--- a/src/Simulator/FireSimulator.cpp
+++ b/src/Simulator/FireSimulator.cpp
@@ -136,13 +136,7 @@ void cFireSimulator::SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChun
continue;
}
- BLOCKTYPE Burnee = E_BLOCK_AIR;
- if (itr->y > 0)
- {
- Burnee = a_Chunk->GetBlock(itr->x, itr->y - 1, itr->z);
- }
-
- if(!DoesBurnForever(Burnee))
+ if((itr->y > 0) && (!DoesBurnForever(a_Chunk->GetBlock(itr->x, itr->y - 1, itr->z))))
{
a_Chunk->SetMeta(idx, BlockMeta + 1);
}