From b67eb2169eba24b767163d882dbf667a429bfbd6 Mon Sep 17 00:00:00 2001
From: Alexander Harkness <me@bearbin.net>
Date: Mon, 27 Oct 2014 20:16:51 +0000
Subject: Another one.#

---
 src/WorldStorage/NBTChunkSerializer.cpp | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'src/WorldStorage')

diff --git a/src/WorldStorage/NBTChunkSerializer.cpp b/src/WorldStorage/NBTChunkSerializer.cpp
index d85a5c329..1ecdcb5fd 100644
--- a/src/WorldStorage/NBTChunkSerializer.cpp
+++ b/src/WorldStorage/NBTChunkSerializer.cpp
@@ -604,6 +604,28 @@ void cNBTChunkSerializer::AddMonsterEntity(cMonster * a_Monster)
 				m_Writer.AddByte("IsConverting", (((const cZombie *)a_Monster)->IsConverting() ? 1 : 0));
 				break;
 			}
+			case mtInvalidType:
+			case mtBlaze:
+			case mtCaveSpider:
+			case mtChicken:
+			case mtCow:
+			case mtEnderDragon:
+			case mtGhast:
+			case mtGiant:
+			case mtIronGolem
+			case mtMooshroom:
+			case mtOcelot:
+			case mtPig:
+			case mtSilverfish:
+			case mtSnowGolem:
+			case meSpider:
+			case mtSquid:
+			case mtWitch:
+			case mtZombiePigman:
+			{
+				// Other mobs have no special tags.
+				break;
+			}
 		}
 	m_Writer.EndCompound();
 }
-- 
cgit v1.2.3


From 232343065f508c3ec32a612d15c6cab7a1553721 Mon Sep 17 00:00:00 2001
From: Alexander Harkness <bearbin@gmail.com>
Date: Mon, 27 Oct 2014 22:03:11 +0000
Subject: Fixed compile (typos).

---
 src/WorldStorage/NBTChunkSerializer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/WorldStorage')

diff --git a/src/WorldStorage/NBTChunkSerializer.cpp b/src/WorldStorage/NBTChunkSerializer.cpp
index 1ecdcb5fd..4daa8cc7b 100644
--- a/src/WorldStorage/NBTChunkSerializer.cpp
+++ b/src/WorldStorage/NBTChunkSerializer.cpp
@@ -612,13 +612,13 @@ void cNBTChunkSerializer::AddMonsterEntity(cMonster * a_Monster)
 			case mtEnderDragon:
 			case mtGhast:
 			case mtGiant:
-			case mtIronGolem
+			case mtIronGolem:
 			case mtMooshroom:
 			case mtOcelot:
 			case mtPig:
 			case mtSilverfish:
 			case mtSnowGolem:
-			case meSpider:
+			case mtSpider:
 			case mtSquid:
 			case mtWitch:
 			case mtZombiePigman:
-- 
cgit v1.2.3


From 165533c27e380300f5e9411e4d46aa553bf2fdeb Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Wed, 29 Oct 2014 15:47:43 +0100
Subject: Fixed 1.8 world item format reading.

---
 src/WorldStorage/WSSAnvil.cpp | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'src/WorldStorage')

diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index af7551ee4..0c77b4d67 100644
--- a/src/WorldStorage/WSSAnvil.cpp
+++ b/src/WorldStorage/WSSAnvil.cpp
@@ -696,11 +696,28 @@ cBlockEntity * cWSSAnvil::LoadBlockEntityFromNBT(const cParsedNBT & a_NBT, int a
 bool cWSSAnvil::LoadItemFromNBT(cItem & a_Item, const cParsedNBT & a_NBT, int a_TagIdx)
 {
 	int Type = a_NBT.FindChildByName(a_TagIdx, "id");
-	if ((Type < 0) || (a_NBT.GetType(Type) != TAG_Short))
+	if (Type <= 0)
 	{
 		return false;
 	}
-	a_Item.m_ItemType = a_NBT.GetShort(Type);
+
+	if (a_NBT.GetType(Type) == TAG_String)
+	{
+		if (!StringToItem(a_NBT.GetString(Type), a_Item))
+		{
+			// Can't resolve item type
+			return false;
+		}
+	}
+	else if (a_NBT.GetType(Type) == TAG_Short)
+	{
+		a_Item.m_ItemType = a_NBT.GetShort(Type);
+	}
+	else
+	{
+		return false;
+	}
+
 	if (a_Item.m_ItemType < 0)
 	{
 		a_Item.Empty();
-- 
cgit v1.2.3