diff options
| author | STRWarrior <niels.breuker@hotmail.nl> | 2014-01-30 21:39:31 +0100 |
|---|---|---|
| committer | STRWarrior <niels.breuker@hotmail.nl> | 2014-01-30 21:39:31 +0100 |
| commit | 419778a3067fda111c7b3e02b062afc592abb605 (patch) | |
| tree | 4028521052db64911d3c9b2a1e9b83aa74620a0f | |
| parent | Documented cFloater. (diff) | |
| download | cuberite-419778a3067fda111c7b3e02b062afc592abb605.tar cuberite-419778a3067fda111c7b3e02b062afc592abb605.tar.gz cuberite-419778a3067fda111c7b3e02b062afc592abb605.tar.bz2 cuberite-419778a3067fda111c7b3e02b062afc592abb605.tar.lz cuberite-419778a3067fda111c7b3e02b062afc592abb605.tar.xz cuberite-419778a3067fda111c7b3e02b062afc592abb605.tar.zst cuberite-419778a3067fda111c7b3e02b062afc592abb605.zip | |
| -rw-r--r-- | src/WorldStorage/NBTChunkSerializer.cpp | 4 | ||||
| -rw-r--r-- | 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()); } |