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

Merge branch 'master' into WorldLoader

Browse Source
This commit is contained in:
Howaner
2014-09-24 15:00:49 +02:00
parent 2832685c02 34b83656b3
commit 65077c314a
9 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/WorldStorage/WSSAnvil.cpp
View File

@@ -2505,10 +2505,24 @@ void cWSSAnvil::LoadWolfFromNBT(cEntityList & a_Entities, const cParsedNBT & a_N
Monster->SetIsAngry(Angry);
}
int CollarColorIdx = a_NBT.FindChildByName(a_TagIdx, "CollarColor");
if ((CollarColorIdx > 0) && (a_NBT.GetType(CollarColorIdx) == TAG_Int))
if (CollarColorIdx > 0)
{
int CollarColor = a_NBT.GetInt(CollarColorIdx);
Monster->SetCollarColor(CollarColor);
switch (a_NBT.GetType(CollarColorIdx))
{
case TAG_Byte:
{
// Vanilla uses this
unsigned char CollarColor = a_NBT.GetByte(CollarColorIdx);
Monster->SetCollarColor(CollarColor);
break;
}
case TAG_Int:
{
// Old MCS code used this, keep reading it for compatibility reasons:
Monster->SetCollarColor(a_NBT.GetInt(CollarColorIdx));
break;
}
}
}
a_Entities.push_back(Monster.release());
}