diff options
| author | madmaxoft <github@xoft.cz> | 2014-09-04 14:02:18 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2014-09-04 14:02:18 +0200 |
| commit | 3297a39c2709cacfd8d66dab80f2935018711890 (patch) | |
| tree | 861a0ea04249e8a64201dec2ce03177f5e2eed1a /src/Chunk.cpp | |
| parent | Debuggers: Reviewed and fixed the Pickups and Poof commands. (diff) | |
| parent | Anvil: Cleanly refuse to store data that is too large. (diff) | |
| download | cuberite-3297a39c2709cacfd8d66dab80f2935018711890.tar cuberite-3297a39c2709cacfd8d66dab80f2935018711890.tar.gz cuberite-3297a39c2709cacfd8d66dab80f2935018711890.tar.bz2 cuberite-3297a39c2709cacfd8d66dab80f2935018711890.tar.lz cuberite-3297a39c2709cacfd8d66dab80f2935018711890.tar.xz cuberite-3297a39c2709cacfd8d66dab80f2935018711890.tar.zst cuberite-3297a39c2709cacfd8d66dab80f2935018711890.zip | |
Diffstat (limited to 'src/Chunk.cpp')
| -rw-r--r-- | src/Chunk.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/Chunk.cpp b/src/Chunk.cpp index 20e943d9a..9fb178bc3 100644 --- a/src/Chunk.cpp +++ b/src/Chunk.cpp @@ -66,7 +66,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 @@ -78,7 +78,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), @@ -654,7 +653,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? @@ -2628,7 +2627,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: |