summaryrefslogtreecommitdiffstats
path: root/src/Simulator
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-03-09 22:48:18 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-03-09 22:48:18 +0100
commit0f412a0a022b75823561c2f78e5f0c9469b0d1b4 (patch)
tree89b1e32d1724d87f0384af3d113e067bee485101 /src/Simulator
parentTNT explodes when consumed by fire (diff)
downloadcuberite-0f412a0a022b75823561c2f78e5f0c9469b0d1b4.tar
cuberite-0f412a0a022b75823561c2f78e5f0c9469b0d1b4.tar.gz
cuberite-0f412a0a022b75823561c2f78e5f0c9469b0d1b4.tar.bz2
cuberite-0f412a0a022b75823561c2f78e5f0c9469b0d1b4.tar.lz
cuberite-0f412a0a022b75823561c2f78e5f0c9469b0d1b4.tar.xz
cuberite-0f412a0a022b75823561c2f78e5f0c9469b0d1b4.tar.zst
cuberite-0f412a0a022b75823561c2f78e5f0c9469b0d1b4.zip
Diffstat (limited to 'src/Simulator')
-rw-r--r--src/Simulator/FireSimulator.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/Simulator/FireSimulator.cpp b/src/Simulator/FireSimulator.cpp
index 6079ea740..31cc0b670 100644
--- a/src/Simulator/FireSimulator.cpp
+++ b/src/Simulator/FireSimulator.cpp
@@ -1,4 +1,3 @@
-
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "FireSimulator.h"
@@ -334,7 +333,6 @@ void cFireSimulator::RemoveFuelNeighbors(cChunk * a_Chunk, int a_RelX, int a_Rel
for (size_t i = 0; i < ARRAYCOUNT(gNeighborCoords); i++)
{
BLOCKTYPE BlockType;
- NIBBLETYPE BlockMeta;
int X = a_RelX + gNeighborCoords[i].x;
int Z = a_RelZ + gNeighborCoords[i].z;
@@ -343,7 +341,7 @@ void cFireSimulator::RemoveFuelNeighbors(cChunk * a_Chunk, int a_RelX, int a_Rel
{
continue;
}
- Neighbour->GetBlockTypeMeta(X, a_RelY + gCrossCoords[i].y, Z, BlockType, BlockMeta);
+ BlockType = Neighbour->GetBlockTypeMeta(X, a_RelY + gCrossCoords[i].y, Z);
if (!IsFuel(BlockType))
{