From 419778a3067fda111c7b3e02b062afc592abb605 Mon Sep 17 00:00:00 2001
From: STRWarrior <niels.breuker@hotmail.nl>
Date: Thu, 30 Jan 2014 21:39:31 +0100
Subject: Fixes #606

---
 src/WorldStorage/NBTChunkSerializer.cpp | 4 ++--
 src/WorldStorage/WSSAnvil.cpp           | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/WorldStorage/NBTChunkSerializer.cpp b/src/WorldStorage/NBTChunkSerializer.cpp
index e46a28caa..9c454c028 100644
--- a/src/WorldStorage/NBTChunkSerializer.cpp
+++ b/src/WorldStorage/NBTChunkSerializer.cpp
@@ -454,8 +454,8 @@ void cNBTChunkSerializer::AddMonsterEntity(cMonster * a_Monster)
 			}
 			case cMonster::mtWolf:
 			{
-				// TODO:
-				// _X: CopyPasta error: m_Writer.AddInt("Profession", ((const cVillager *)a_Monster)->GetVilType());
+				m_Writer.AddString("Owner", ((const cWolf *)a_Monster)->GetOwner());
+				m_Writer.AddByte("Sitting", ((const cWolf *)a_Monster)->IsSitting()); 
 				break;
 			}
 			case cMonster::mtZombie:
diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index a0f9136d8..ab85cf3e2 100644
--- a/src/WorldStorage/WSSAnvil.cpp
+++ b/src/WorldStorage/WSSAnvil.cpp
@@ -1876,6 +1876,13 @@ void cWSSAnvil::LoadWolfFromNBT(cEntityList & a_Entities, const cParsedNBT & a_N
 	{
 		return;
 	}
+	int OwnerIdx = a_NBT.FindChildByName(a_TagIdx, "Owner");
+	AString OwnerName = a_NBT.GetString(OwnerIdx);
+	if (OwnerName != "")
+	{
+		Monster->SetOwner(OwnerName);
+		Monster->SetIsTame(true);
+	}
 
 	a_Entities.push_back(Monster.release());
 }
-- 
cgit v1.2.3


From 1a361be44fe2a454734e3ac0e93211e33e566976 Mon Sep 17 00:00:00 2001
From: STRWarrior <niels.breuker@hotmail.nl>
Date: Thu, 30 Jan 2014 21:46:45 +0100
Subject: Check if the tag is found.

---
 src/WorldStorage/WSSAnvil.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index ab85cf3e2..1827eff58 100644
--- a/src/WorldStorage/WSSAnvil.cpp
+++ b/src/WorldStorage/WSSAnvil.cpp
@@ -1877,6 +1877,11 @@ void cWSSAnvil::LoadWolfFromNBT(cEntityList & a_Entities, const cParsedNBT & a_N
 		return;
 	}
 	int OwnerIdx = a_NBT.FindChildByName(a_TagIdx, "Owner");
+	if (TypeIdx < 0) 
+	{ 
+		return;
+	}
+
 	AString OwnerName = a_NBT.GetString(OwnerIdx);
 	if (OwnerName != "")
 	{
-- 
cgit v1.2.3


From 550a09020d4e40904a205ebe7daf1d2421e51070 Mon Sep 17 00:00:00 2001
From: STRWarrior <niels.breuker@hotmail.nl>
Date: Thu, 30 Jan 2014 21:49:39 +0100
Subject: Fixed bad variable.

---
 src/WorldStorage/WSSAnvil.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index 1827eff58..e581c433e 100644
--- a/src/WorldStorage/WSSAnvil.cpp
+++ b/src/WorldStorage/WSSAnvil.cpp
@@ -1877,7 +1877,7 @@ void cWSSAnvil::LoadWolfFromNBT(cEntityList & a_Entities, const cParsedNBT & a_N
 		return;
 	}
 	int OwnerIdx = a_NBT.FindChildByName(a_TagIdx, "Owner");
-	if (TypeIdx < 0) 
+	if (OwnerIdx < 0) 
 	{ 
 		return;
 	}
-- 
cgit v1.2.3


From c7e4ade7c357ce152319bf01527410d8323b929d Mon Sep 17 00:00:00 2001
From: STRWarrior <niels.breuker@hotmail.nl>
Date: Fri, 31 Jan 2014 16:27:21 +0100
Subject: Wolf: If Owner tag is missing a normal ownerless wolf will spawn.

---
 src/WorldStorage/WSSAnvil.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index e581c433e..0df97d759 100644
--- a/src/WorldStorage/WSSAnvil.cpp
+++ b/src/WorldStorage/WSSAnvil.cpp
@@ -1879,16 +1879,13 @@ void cWSSAnvil::LoadWolfFromNBT(cEntityList & a_Entities, const cParsedNBT & a_N
 	int OwnerIdx = a_NBT.FindChildByName(a_TagIdx, "Owner");
 	if (OwnerIdx < 0) 
 	{ 
-		return;
-	}
-
-	AString OwnerName = a_NBT.GetString(OwnerIdx);
-	if (OwnerName != "")
-	{
-		Monster->SetOwner(OwnerName);
-		Monster->SetIsTame(true);
+		AString OwnerName = a_NBT.GetString(OwnerIdx);
+		if (OwnerName != "")
+		{
+			Monster->SetOwner(OwnerName);
+			Monster->SetIsTame(true);
+		}
 	}
-
 	a_Entities.push_back(Monster.release());
 }
 
-- 
cgit v1.2.3


From 19e5122b772dc3183afa204814cec5cd52e5ec1a Mon Sep 17 00:00:00 2001
From: STRWarrior <niels.breuker@hotmail.nl>
Date: Fri, 31 Jan 2014 16:31:55 +0100
Subject: Inversed condition.

---
 src/WorldStorage/WSSAnvil.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index 0df97d759..02396bb16 100644
--- a/src/WorldStorage/WSSAnvil.cpp
+++ b/src/WorldStorage/WSSAnvil.cpp
@@ -1877,7 +1877,7 @@ void cWSSAnvil::LoadWolfFromNBT(cEntityList & a_Entities, const cParsedNBT & a_N
 		return;
 	}
 	int OwnerIdx = a_NBT.FindChildByName(a_TagIdx, "Owner");
-	if (OwnerIdx < 0) 
+	if (OwnerIdx > 0) 
 	{ 
 		AString OwnerName = a_NBT.GetString(OwnerIdx);
 		if (OwnerName != "")
-- 
cgit v1.2.3