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

Merge branch 'master' into chunksparsing/structs

Browse Source 
Conflicts:
	src/Chunk.cpp
	src/Chunk.h
This commit is contained in:
Tycho
2014-04-27 06:35:27 -07:00
parent e40f9d6e5b 1139b117c4
commit 57b8ee9163
188 changed files with 11188 additions and 4931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/WorldStorage/WSSCompact.cpp
View File

@@ -837,7 +837,7 @@ void cWSSCompact::cPAKFile::UpdateChunk2To3()
bool cWSSCompact::LoadChunkFromData(const cChunkCoords & a_Chunk, int & a_UncompressedSize, const AString & a_Data, cWorld * a_World)
bool cWSSCompact::LoadChunkFromData(const cChunkCoords & a_Chunk, int a_UncompressedSize, const AString & a_Data, cWorld * a_World)
{
// Crude data integrity check:
if (a_UncompressedSize < cChunkDef::BlockDataSize)