summaryrefslogtreecommitdiffstats
path: root/src/Chunk.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-09-03 21:47:00 +0200
committerMattes D <github@xoft.cz>2014-09-03 21:47:00 +0200
commitc140ba2367bd36bbf56dfd0fdbdb2dbb0d3daa66 (patch)
tree7999d8162d8b390b7bc94831a52f36c8f9743b1f /src/Chunk.cpp
parentAnvil: switched inflate to stream mode. (diff)
parentcommit (diff)
downloadcuberite-c140ba2367bd36bbf56dfd0fdbdb2dbb0d3daa66.tar
cuberite-c140ba2367bd36bbf56dfd0fdbdb2dbb0d3daa66.tar.gz
cuberite-c140ba2367bd36bbf56dfd0fdbdb2dbb0d3daa66.tar.bz2
cuberite-c140ba2367bd36bbf56dfd0fdbdb2dbb0d3daa66.tar.lz
cuberite-c140ba2367bd36bbf56dfd0fdbdb2dbb0d3daa66.tar.xz
cuberite-c140ba2367bd36bbf56dfd0fdbdb2dbb0d3daa66.tar.zst
cuberite-c140ba2367bd36bbf56dfd0fdbdb2dbb0d3daa66.zip
Diffstat (limited to 'src/Chunk.cpp')
-rw-r--r--src/Chunk.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/Chunk.cpp b/src/Chunk.cpp
index 40ffff834..95b8c8e5e 100644
--- a/src/Chunk.cpp
+++ b/src/Chunk.cpp
@@ -65,7 +65,7 @@ sSetBlock::sSetBlock( int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_Bloc
// cChunk:
cChunk::cChunk(
- int a_ChunkX, int a_ChunkY, int a_ChunkZ,
+ int a_ChunkX, int a_ChunkZ,
cChunkMap * a_ChunkMap, cWorld * a_World,
cChunk * a_NeighborXM, cChunk * a_NeighborXP, cChunk * a_NeighborZM, cChunk * a_NeighborZP,
cAllocationPool<cChunkData::sChunkSection> & a_Pool
@@ -77,7 +77,6 @@ cChunk::cChunk(
m_HasLoadFailed(false),
m_StayCount(0),
m_PosX(a_ChunkX),
- m_PosY(a_ChunkY),
m_PosZ(a_ChunkZ),
m_World(a_World),
m_ChunkMap(a_ChunkMap),
@@ -653,7 +652,7 @@ void cChunk::MoveEntityToNewChunk(cEntity * a_Entity)
cChunk * Neighbor = GetNeighborChunk(a_Entity->GetChunkX() * cChunkDef::Width, a_Entity->GetChunkZ() * cChunkDef::Width);
if (Neighbor == NULL)
{
- Neighbor = m_ChunkMap->GetChunkNoLoad(a_Entity->GetChunkX(), ZERO_CHUNK_Y, a_Entity->GetChunkZ());
+ Neighbor = m_ChunkMap->GetChunkNoLoad(a_Entity->GetChunkX(), a_Entity->GetChunkZ());
if (Neighbor == NULL)
{
// TODO: What to do with this?
@@ -2603,7 +2602,7 @@ cChunk * cChunk::GetRelNeighborChunk(int a_RelX, int a_RelZ)
int BlockZ = m_PosZ * cChunkDef::Width + a_RelZ;
int ChunkX, ChunkZ;
BlockToChunk(BlockX, BlockZ, ChunkX, ChunkZ);
- return m_ChunkMap->GetChunkNoLoad(ChunkX, ZERO_CHUNK_Y, ChunkZ);
+ return m_ChunkMap->GetChunkNoLoad(ChunkX, ChunkZ);
}
// Walk the neighbors: