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

Unified the chunk data to use the BLOCKDATA datatype.

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@413 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com
2012-03-14 21:21:03 +00:00
parent 0aefed3e22
commit b974b1ea59
16 changed files with 52 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/WSSCompact.cpp
View File

@@ -734,12 +734,14 @@ bool cWSSCompact::LoadChunkFromData(const cChunkCoords & a_Chunk, int & a_Uncomp
}
}
BLOCKTYPE * BlockData = (BLOCKTYPE *)UncompressedData.data();
a_World->ChunkDataLoaded(
a_Chunk.m_ChunkX, a_Chunk.m_ChunkY, a_Chunk.m_ChunkZ,
UncompressedData.data(),
UncompressedData.data() + cChunkDef::MetaOffset,
UncompressedData.data() + cChunkDef::LightOffset,
UncompressedData.data() + cChunkDef::SkyLightOffset,
BlockData,
BlockData + cChunkDef::MetaOffset,
BlockData + cChunkDef::LightOffset,
BlockData + cChunkDef::SkyLightOffset,
NULL,
Entities,
BlockEntities
@@ -788,7 +790,7 @@ bool cWSSCompact::cPAKFile::SaveChunkToData(const cChunkCoords & a_Chunk, cWorld
}
AString Data;
Data.assign(Serializer.GetBlockData(), cChunkDef::BlockDataSize);
Data.assign((const char *)Serializer.GetBlockData(), cChunkDef::BlockDataSize);
if (Serializer.HasJsonData())
{
AString JsonData;