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

Merge branch 'master' into redstoneTests

Browse Source 
Conflicts:
	src/Mobs/Monster.h
This commit is contained in:
Tycho
2014-09-25 15:22:08 +01:00
parent 73dfe1fe81 2867672815
commit 9c459cbe50
83 changed files with 6854 additions and 952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/WorldStorage/NBTChunkSerializer.cpp
View File

@@ -81,6 +81,18 @@ void cNBTChunkSerializer::Finish(void)
memset(m_BlockLight, 0, sizeof(m_BlockLight));
memset(m_BlockSkyLight, 0, sizeof(m_BlockSkyLight));
}
// Check if "Entity" and "TileEntities" lists exists. MCEdit requires this.
if (!m_HasHadEntity)
{
m_Writer.BeginList("Entities", TAG_Compound);
m_Writer.EndList();
}
if (!m_HasHadBlockEntity)
{
m_Writer.BeginList("TileEntities", TAG_Compound);
m_Writer.EndList();
}
}
@@ -504,6 +516,8 @@ void cNBTChunkSerializer::AddMonsterEntity(cMonster * a_Monster)
m_Writer.AddFloat("", a_Monster->GetDropChanceBoots());
m_Writer.EndList();
m_Writer.AddByte("CanPickUpLoot", (char)a_Monster->CanPickUpLoot());
m_Writer.AddString("CustomName", a_Monster->GetCustomName());
m_Writer.AddByte("CustomNameVisible", (char)a_Monster->IsCustomNameAlwaysVisible());
switch (a_Monster->GetMobType())
{
case mtBat:
@@ -580,7 +594,7 @@ void cNBTChunkSerializer::AddMonsterEntity(cMonster * a_Monster)
}
m_Writer.AddByte("Sitting", Wolf.IsSitting() ? 1 : 0);
m_Writer.AddByte("Angry", Wolf.IsAngry() ? 1 : 0);
m_Writer.AddInt("CollarColor", Wolf.GetCollarColor());
m_Writer.AddByte("CollarColor", (unsigned char)Wolf.GetCollarColor());
break;
}
case mtZombie:
@@ -763,6 +777,22 @@ void cNBTChunkSerializer::LightIsValid(bool a_IsLightValid)
void cNBTChunkSerializer::HeightMap(const cChunkDef::HeightMap * a_HeightMap)
{
for (int RelX = 0; RelX < cChunkDef::Width; RelX++)
{
for (int RelZ = 0; RelZ < cChunkDef::Width; RelZ++)
{
int Height = cChunkDef::GetHeight(*a_HeightMap, RelX, RelZ);
m_VanillaHeightMap[(RelZ << 4) | RelX] = Height;
}
}
}
void cNBTChunkSerializer::BiomeData(const cChunkDef::BiomeMap * a_BiomeMap)
{
memcpy(m_Biomes, a_BiomeMap, sizeof(m_Biomes));