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

Fixed bug in setting metas

Browse Source
This commit is contained in:
Tycho 2014-05-10 15:19:06 +01:00
parent 83a7b2333f
commit cb6200345c
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Chunk.cpp
View File

@ -1568,24 +1568,6 @@ void cChunk::FastSetBlock(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_BlockT
void cChunk::SetMeta(int a_BlockIdx, NIBBLETYPE a_Meta)
{
if (GetNibble(m_BlockMeta, a_BlockIdx) == a_Meta)
{
return;
}
MarkDirty();
SetNibble(m_BlockMeta, a_BlockIdx, a_Meta);
Vector3i Coords(IndexToCoordinate(a_BlockIdx));
m_PendingSendBlocks.push_back(sSetBlock(m_PosX, m_PosZ, Coords.x, Coords.y, Coords.z, GetBlock(a_BlockIdx), a_Meta));
}
void cChunk::SendBlockTo(int a_RelX, int a_RelY, int a_RelZ, cClientHandle * a_Client)
{

8
src/Chunk.h
View File

@ -328,7 +328,13 @@ public:
}
inline void SetMeta(int a_RelX, int a_RelY, int a_RelZ, NIBBLETYPE a_Meta)
{
m_ChunkBuffer.SetMeta(a_RelX, a_RelY, a_RelZ, a_Meta);
if (!GetMeta(a_RelX, a_RelY, a_RelZ) == a_Meta)
{
MarkDirty();
m_ChunkBuffer.SetMeta(a_RelX, a_RelY, a_RelZ, a_Meta);
m_PendingSendBlocks.push_back(sSetBlock(m_PosX, m_PosZ, a_RelX, a_RelY, a_RelZ, GetBlock(a_RelX, a_RelY, a_RelZ), a_Meta));
}
}
inline NIBBLETYPE GetBlockLight(int a_RelX, int a_RelY, int a_RelZ) const {return m_ChunkBuffer.GetBlockLight(a_RelX, a_RelY, a_RelZ); }