summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Barney <samjbarney@gmail.com>2013-12-02 22:11:45 +0100
committerSamuel Barney <samjbarney@gmail.com>2013-12-02 22:11:45 +0100
commit30906a597c660f1f22508f7c055f3219551adf77 (patch)
tree0292ce19573d05fb53c737fbc1c6b03b7e4c7481
parentRemoved stray printf, again. (diff)
downloadcuberite-30906a597c660f1f22508f7c055f3219551adf77.tar
cuberite-30906a597c660f1f22508f7c055f3219551adf77.tar.gz
cuberite-30906a597c660f1f22508f7c055f3219551adf77.tar.bz2
cuberite-30906a597c660f1f22508f7c055f3219551adf77.tar.lz
cuberite-30906a597c660f1f22508f7c055f3219551adf77.tar.xz
cuberite-30906a597c660f1f22508f7c055f3219551adf77.tar.zst
cuberite-30906a597c660f1f22508f7c055f3219551adf77.zip
Diffstat (limited to '')
-rw-r--r--src/Simulator/FireSimulator.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Simulator/FireSimulator.cpp b/src/Simulator/FireSimulator.cpp
index ac3fb9695..bfbc4b1c7 100644
--- a/src/Simulator/FireSimulator.cpp
+++ b/src/Simulator/FireSimulator.cpp
@@ -94,7 +94,9 @@ void cFireSimulator::SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChun
for (cCoordWithIntList::iterator itr = Data.begin(); itr != Data.end();)
{
int idx = cChunkDef::MakeIndexNoCheck(itr->x, itr->y, itr->z);
+ int idb = cChunkDef::MakeIndexNoCheck(itr->x, itr->y - 1, itr->z);
BLOCKTYPE BlockType = a_Chunk->GetBlock(idx);
+ BLOCKTYPE Burnee = a_Chunk->GetBlock(idb);
if (!IsAllowedBlock(BlockType))
{
@@ -135,7 +137,10 @@ void cFireSimulator::SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChun
itr = Data.erase(itr);
continue;
}
- a_Chunk->SetMeta(idx, BlockMeta + 1);
+ if(Burnee != E_BLOCK_NETHERRACK)
+ {
+ a_Chunk->SetMeta(idx, BlockMeta + 1);
+ }
itr->Data = GetBurnStepTime(a_Chunk, itr->x, itr->y, itr->z); // TODO: Add some randomness into this
} // for itr - Data[]
}