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

Merge pull request #607 from mc-server/Wolf_Owner_Saving

Browse Source 
Wolf: Their owner now gets saved.
This commit is contained in:
Mattes D 2014-01-31 07:32:38 -08:00
commit 617c5b1fff
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/WorldStorage/NBTChunkSerializer.cpp
View File

@ -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:

11
src/WorldStorage/WSSAnvil.cpp
View File

@ -1876,7 +1876,16 @@ void cWSSAnvil::LoadWolfFromNBT(cEntityList & a_Entities, const cParsedNBT & a_N
{
return;
}
int OwnerIdx = a_NBT.FindChildByName(a_TagIdx, "Owner");
if (OwnerIdx > 0)
{
AString OwnerName = a_NBT.GetString(OwnerIdx);
if (OwnerName != "")
{
Monster->SetOwner(OwnerName);
Monster->SetIsTame(true);
}
}
a_Entities.push_back(Monster.release());
}