diff options
| author | Mattes D <github@xoft.cz> | 2013-12-06 11:41:37 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2013-12-06 11:41:37 +0100 |
| commit | dde1c3a7cd326a142e6e21c799bfc3306c5cb350 (patch) | |
| tree | 066134db5f8ecbca2f729a30dfb100fa1f02086d | |
| parent | APIDump: Documented the new cPluginManager:GetCurrentPlugin() function. (diff) | |
| parent | I don't know how this dissapeard. (diff) | |
| download | cuberite-dde1c3a7cd326a142e6e21c799bfc3306c5cb350.tar cuberite-dde1c3a7cd326a142e6e21c799bfc3306c5cb350.tar.gz cuberite-dde1c3a7cd326a142e6e21c799bfc3306c5cb350.tar.bz2 cuberite-dde1c3a7cd326a142e6e21c799bfc3306c5cb350.tar.lz cuberite-dde1c3a7cd326a142e6e21c799bfc3306c5cb350.tar.xz cuberite-dde1c3a7cd326a142e6e21c799bfc3306c5cb350.tar.zst cuberite-dde1c3a7cd326a142e6e21c799bfc3306c5cb350.zip | |
| m--------- | MCServer/Plugins/TransAPI | 6 | ||||
| -rw-r--r-- | src/Simulator/FireSimulator.cpp | 10 | ||||
| -rw-r--r-- | src/Simulator/FireSimulator.h | 2 |
3 files changed, 14 insertions, 4 deletions
diff --git a/MCServer/Plugins/TransAPI b/MCServer/Plugins/TransAPI -Subproject da272372406e0990235b008dba73b7bfbda040e +Subproject 52e1de4332a026e58fda843aae98c1f51e57199 diff --git a/src/Simulator/FireSimulator.cpp b/src/Simulator/FireSimulator.cpp index ac3fb9695..03e4f6e45 100644 --- a/src/Simulator/FireSimulator.cpp +++ b/src/Simulator/FireSimulator.cpp @@ -135,7 +135,11 @@ 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((itr->y > 0) && (!DoesBurnForever(a_Chunk->GetBlock(itr->x, itr->y - 1, itr->z)))) + { + 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[] } @@ -176,7 +180,7 @@ bool cFireSimulator::IsFuel(BLOCKTYPE a_BlockType) -bool cFireSimulator::IsForever(BLOCKTYPE a_BlockType) +bool cFireSimulator::DoesBurnForever(BLOCKTYPE a_BlockType) { return (a_BlockType == E_BLOCK_NETHERRACK); } @@ -225,7 +229,7 @@ int cFireSimulator::GetBurnStepTime(cChunk * a_Chunk, int a_RelX, int a_RelY, in if (a_RelY > 0) { BLOCKTYPE BlockBelow = a_Chunk->GetBlock(a_RelX, a_RelY - 1, a_RelZ); - if (IsForever(BlockBelow)) + if (DoesBurnForever(BlockBelow)) { // Is burning atop of netherrack, burn forever (re-check in 10 sec) return 10000; diff --git a/src/Simulator/FireSimulator.h b/src/Simulator/FireSimulator.h index a788ed327..66c31b440 100644 --- a/src/Simulator/FireSimulator.h +++ b/src/Simulator/FireSimulator.h @@ -28,7 +28,7 @@ public: virtual bool IsAllowedBlock(BLOCKTYPE a_BlockType) override; static bool IsFuel (BLOCKTYPE a_BlockType); - static bool IsForever(BLOCKTYPE a_BlockType); + static bool DoesBurnForever(BLOCKTYPE a_BlockType); protected: /// Time (in msec) that a fire block takes to burn with a fuel block into the next step |