diff options
| author | Mattes D <github@xoft.cz> | 2014-10-21 22:02:30 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-10-21 22:02:30 +0200 |
| commit | a42fa071bc3ac1615e7c9b9d59fb4c882cc6097d (patch) | |
| tree | ecd4214f8c2c11abb7bc0ff87cef26dd79ee6063 /src/WorldStorage/NBTChunkSerializer.cpp | |
| parent | Fixed trailing whitespace. (diff) | |
| download | cuberite-a42fa071bc3ac1615e7c9b9d59fb4c882cc6097d.tar cuberite-a42fa071bc3ac1615e7c9b9d59fb4c882cc6097d.tar.gz cuberite-a42fa071bc3ac1615e7c9b9d59fb4c882cc6097d.tar.bz2 cuberite-a42fa071bc3ac1615e7c9b9d59fb4c882cc6097d.tar.lz cuberite-a42fa071bc3ac1615e7c9b9d59fb4c882cc6097d.tar.xz cuberite-a42fa071bc3ac1615e7c9b9d59fb4c882cc6097d.tar.zst cuberite-a42fa071bc3ac1615e7c9b9d59fb4c882cc6097d.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/WorldStorage/NBTChunkSerializer.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/WorldStorage/NBTChunkSerializer.cpp b/src/WorldStorage/NBTChunkSerializer.cpp index 28b9dd042..80d9ab6d2 100644 --- a/src/WorldStorage/NBTChunkSerializer.cpp +++ b/src/WorldStorage/NBTChunkSerializer.cpp @@ -685,21 +685,21 @@ void cNBTChunkSerializer::AddProjectileEntity(cProjectileEntity * a_Projectile) void cNBTChunkSerializer::AddHangingEntity(cHangingEntity * a_Hanging) { - m_Writer.AddByte("Direction", (unsigned char)a_Hanging->GetDirection()); - m_Writer.AddInt("TileX", a_Hanging->GetTileX()); - m_Writer.AddInt("TileY", a_Hanging->GetTileY()); - m_Writer.AddInt("TileZ", a_Hanging->GetTileZ()); - switch (a_Hanging->GetDirection()) + m_Writer.AddInt("TileX", a_Hanging->GetBlockX()); + m_Writer.AddInt("TileY", a_Hanging->GetBlockY()); + m_Writer.AddInt("TileZ", a_Hanging->GetBlockZ()); + switch (a_Hanging->GetFacing()) { - case BLOCK_FACE_YM: m_Writer.AddByte("Dir", (unsigned char)2); break; - case BLOCK_FACE_YP: m_Writer.AddByte("Dir", (unsigned char)1); break; - case BLOCK_FACE_ZM: m_Writer.AddByte("Dir", (unsigned char)0); break; - case BLOCK_FACE_ZP: m_Writer.AddByte("Dir", (unsigned char)3); break; + case BLOCK_FACE_XM: m_Writer.AddByte("Facing", 1); break; + case BLOCK_FACE_XP: m_Writer.AddByte("Facing", 3); break; + case BLOCK_FACE_ZM: m_Writer.AddByte("Facing", 2); break; + case BLOCK_FACE_ZP: m_Writer.AddByte("Facing", 0); break; - case BLOCK_FACE_XM: - case BLOCK_FACE_XP: + case BLOCK_FACE_YM: + case BLOCK_FACE_YP: case BLOCK_FACE_NONE: { + // These directions are invalid, but they may have been previously loaded, so keep them. break; } } @@ -740,7 +740,7 @@ void cNBTChunkSerializer::AddItemFrameEntity(cItemFrame * a_ItemFrame) AddBasicEntity(a_ItemFrame, "ItemFrame"); AddHangingEntity(a_ItemFrame); AddItem(a_ItemFrame->GetItem(), -1, "Item"); - m_Writer.AddByte("ItemRotation", (unsigned char)a_ItemFrame->GetRotation()); + m_Writer.AddByte("ItemRotation", (unsigned char)a_ItemFrame->GetItemRotation()); m_Writer.AddFloat("ItemDropChance", 1.0F); m_Writer.EndCompound(); } |