summaryrefslogtreecommitdiffstats
path: root/src/ChunkMap.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-04-26 23:26:59 +0200
committerMattes D <github@xoft.cz>2014-04-26 23:26:59 +0200
commitda931da6037279826a52980f9335e189c370d4d2 (patch)
tree2935aeea2eab9d1ce7dbf571087d905a4681fae3 /src/ChunkMap.cpp
parentMerge pull request #863 from mc-server/chunkysparsing (diff)
parentMore small fixes. (diff)
downloadcuberite-da931da6037279826a52980f9335e189c370d4d2.tar
cuberite-da931da6037279826a52980f9335e189c370d4d2.tar.gz
cuberite-da931da6037279826a52980f9335e189c370d4d2.tar.bz2
cuberite-da931da6037279826a52980f9335e189c370d4d2.tar.lz
cuberite-da931da6037279826a52980f9335e189c370d4d2.tar.xz
cuberite-da931da6037279826a52980f9335e189c370d4d2.tar.zst
cuberite-da931da6037279826a52980f9335e189c370d4d2.zip
Diffstat (limited to '')
-rw-r--r--src/ChunkMap.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp
index ed9103174..0fb6988b5 100644
--- a/src/ChunkMap.cpp
+++ b/src/ChunkMap.cpp
@@ -346,9 +346,8 @@ void cChunkMap::BroadcastAttachEntity(const cEntity & a_Entity, const cEntity *
void cChunkMap::BroadcastBlockAction(int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType, const cClientHandle * a_Exclude)
{
cCSLock Lock(m_CSLayers);
- int x, y, z, ChunkX, ChunkZ;
+ int x, z, ChunkX, ChunkZ;
x = a_BlockX;
- y = a_BlockY;
z = a_BlockZ;
cChunkDef::BlockToChunk(x, z, ChunkX, ChunkZ);
cChunkPtr Chunk = GetChunkNoGen(ChunkX, ZERO_CHUNK_Y, ChunkZ);
@@ -1146,9 +1145,8 @@ BLOCKTYPE cChunkMap::GetBlock(int a_BlockX, int a_BlockY, int a_BlockZ)
// First check if it isn't queued in the m_FastSetBlockQueue:
{
int X = a_BlockX, Y = a_BlockY, Z = a_BlockZ;
- int ChunkX, ChunkY, ChunkZ;
+ int ChunkX, ChunkZ;
cChunkDef::AbsoluteToRelative(X, Y, Z, ChunkX, ChunkZ);
- ChunkY = 0;
cCSLock Lock(m_CSFastSetBlock);
for (sSetBlockList::iterator itr = m_FastSetBlockQueue.begin(); itr != m_FastSetBlockQueue.end(); ++itr)
{