flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge branch 'master' into chunksparsing/structs

Browse Source 
Conflicts:
	src/Chunk.cpp
	src/Chunk.h
This commit is contained in:
Tycho
2014-04-27 06:35:27 -07:00
parent e40f9d6e5b 1139b117c4
commit 57b8ee9163
188 changed files with 11188 additions and 4931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Simulator/FireSimulator.cpp
View File

@@ -352,7 +352,7 @@ void cFireSimulator::RemoveFuelNeighbors(cChunk * a_Chunk, int a_RelX, int a_Rel
{
continue;
}
BlockType = Neighbour->GetBlock(X, a_RelY + gCrossCoords[i].y, Z);
BlockType = Neighbour->GetBlock(X, a_RelY + gNeighborCoords[i].y, Z);
if (!IsFuel(BlockType))
{