Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Possible hotfix for empty NMS lists.

Browse Source
This commit is contained in:
Olof Larsson 2012-11-24 19:14:25 +01:00
parent 303f91430a
commit 79c42a56e6
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/massivecraft/mcore5/adapter/NbtGsonConverter.java
View File

@ -75,13 +75,11 @@ public class NbtGsonConverter
if (type == NBType.LIST) if (type == NBType.LIST)
{ {
JsonElement elemtypeElement = jsonObject.get(ELEMTYPE); JsonElement elemtypeElement = jsonObject.get(ELEMTYPE);
if (elemtypeElement == null) if (elemtypeElement != null)
{ {
// must have an elemtype
return null;
}
elemtype = NBType.getByName(elemtypeElement.getAsString()); elemtype = NBType.getByName(elemtypeElement.getAsString());
} }
}
// Fetch the value field // Fetch the value field
JsonElement val = jsonObject.get(VAL); JsonElement val = jsonObject.get(VAL);
@ -215,7 +213,13 @@ public class NbtGsonConverter
if (type == NBType.LIST) if (type == NBType.LIST)
{ {
ret.addProperty(ELEMTYPE, NBType.getByTag(((NBTTagList)nbt).get(0)).getName()); NBType elemtype = NBType.UNKNOWN;
NBTTagList nbtl = (NBTTagList)nbt;
if (nbtl.size() > 0)
{
elemtype = NBType.getByTag(nbtl.get(0));
}
ret.addProperty(ELEMTYPE, elemtype.getName());
} }
JsonElement val = nbtToGsonVal(nbt); JsonElement val = nbtToGsonVal(nbt);