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

Fixed a crash in WSSAnvil.

Browse Source 
Reported as #1448.
This commit is contained in:
madmaxoft 2014-09-23 22:11:25 +02:00
parent 33f8091d5f
commit 0b40ce971c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/WorldStorage/WSSAnvil.cpp
View File

@ -2464,19 +2464,19 @@ void cWSSAnvil::LoadWolfFromNBT(cEntityList & a_Entities, const cParsedNBT & a_N
LoadWolfOwner(*Monster.get(), a_NBT, a_TagIdx); LoadWolfOwner(*Monster.get(), a_NBT, a_TagIdx);
int SittingIdx = a_NBT.FindChildByName(a_TagIdx, "Sitting"); int SittingIdx = a_NBT.FindChildByName(a_TagIdx, "Sitting");
if (SittingIdx > 0) if ((SittingIdx > 0) && (a_NBT.GetType(SittingIdx) == TAG_Byte))
{ {
bool Sitting = ((a_NBT.GetByte(SittingIdx) == 1) ? true : false); bool Sitting = ((a_NBT.GetByte(SittingIdx) == 1) ? true : false);
Monster->SetIsSitting(Sitting); Monster->SetIsSitting(Sitting);
} }
int AngryIdx = a_NBT.FindChildByName(a_TagIdx, "Angry"); int AngryIdx = a_NBT.FindChildByName(a_TagIdx, "Angry");
if (AngryIdx > 0) if ((AngryIdx > 0) && (a_NBT.GetType(AngryIdx) == TAG_Byte))
{ {
bool Angry = ((a_NBT.GetByte(AngryIdx) == 1) ? true : false); bool Angry = ((a_NBT.GetByte(AngryIdx) == 1) ? true : false);
Monster->SetIsAngry(Angry); Monster->SetIsAngry(Angry);
} }
int CollarColorIdx = a_NBT.FindChildByName(a_TagIdx, "CollarColor"); int CollarColorIdx = a_NBT.FindChildByName(a_TagIdx, "CollarColor");
if (CollarColorIdx > 0) if ((CollarColorIdx > 0) && (a_NBT.GetType(CollarColorIdx) == TAG_Int))
{ {
int CollarColor = a_NBT.GetInt(CollarColorIdx); int CollarColor = a_NBT.GetInt(CollarColorIdx);
Monster->SetCollarColor(CollarColor); Monster->SetCollarColor(CollarColor);