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

Fixed scoreboard loader type checks.

Browse Source 
Fixes scoreboard loading error reported on the Dropper map in #1307.
This commit is contained in:
Mattes D 2014-09-06 13:11:08 +02:00
parent f6e029253f
commit dd0aa22d2e
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/WorldStorage/ScoreboardSerializer.cpp
View File

@ -283,37 +283,37 @@ bool cScoreboardSerializer::LoadScoreboardFromNBT(const cParsedNBT & a_NBT)
bool AllowsFriendlyFire = true, CanSeeFriendlyInvisible = false; bool AllowsFriendlyFire = true, CanSeeFriendlyInvisible = false;
int CurrLine = a_NBT.FindChildByName(Child, "Name"); int CurrLine = a_NBT.FindChildByName(Child, "Name");
if (CurrLine >= 0) if ((CurrLine >= 0) && (a_NBT.GetType(CurrLine) == TAG_String))
{ {
Name = a_NBT.GetInt(CurrLine); Name = a_NBT.GetString(CurrLine);
} }
CurrLine = a_NBT.FindChildByName(Child, "DisplayName"); CurrLine = a_NBT.FindChildByName(Child, "DisplayName");
if (CurrLine >= 0) if ((CurrLine >= 0) && (a_NBT.GetType(CurrLine) == TAG_String))
{ {
DisplayName = a_NBT.GetInt(CurrLine); DisplayName = a_NBT.GetString(CurrLine);
} }
CurrLine = a_NBT.FindChildByName(Child, "Prefix"); CurrLine = a_NBT.FindChildByName(Child, "Prefix");
if (CurrLine >= 0) if ((CurrLine >= 0) && (a_NBT.GetType(CurrLine) == TAG_String))
{ {
Prefix = a_NBT.GetInt(CurrLine); Prefix = a_NBT.GetString(CurrLine);
} }
CurrLine = a_NBT.FindChildByName(Child, "Suffix"); CurrLine = a_NBT.FindChildByName(Child, "Suffix");
if (CurrLine >= 0) if ((CurrLine >= 0) && (a_NBT.GetType(CurrLine) == TAG_String))
{ {
Suffix = a_NBT.GetInt(CurrLine); Suffix = a_NBT.GetString(CurrLine);
} }
CurrLine = a_NBT.FindChildByName(Child, "AllowFriendlyFire"); CurrLine = a_NBT.FindChildByName(Child, "AllowFriendlyFire");
if (CurrLine >= 0) if ((CurrLine >= 0) && (a_NBT.GetType(CurrLine) == TAG_Int))
{ {
AllowsFriendlyFire = (a_NBT.GetInt(CurrLine) != 0); AllowsFriendlyFire = (a_NBT.GetInt(CurrLine) != 0);
} }
CurrLine = a_NBT.FindChildByName(Child, "SeeFriendlyInvisibles"); CurrLine = a_NBT.FindChildByName(Child, "SeeFriendlyInvisibles");
if (CurrLine >= 0) if ((CurrLine >= 0) && (a_NBT.GetType(CurrLine) == TAG_Int))
{ {
CanSeeFriendlyInvisible = (a_NBT.GetInt(CurrLine) != 0); CanSeeFriendlyInvisible = (a_NBT.GetInt(CurrLine) != 0);
} }