Anvilcraft/equivalent-exchange-3
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Better protection of parsing values from json

Browse source
This commit is contained in:
Pahimar 2016-05-20 23:07:28 -04:00
parent 28080229f7
commit bd4b5bf5ee
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/main/java/com/pahimar/ee3/util/serialize/WrappedStackSerializer.java
View file

@ -24,13 +24,34 @@ public class WrappedStackSerializer implements JsonSerializer<WrappedStack>, Jso
WrappedStack wrappedStack = null; WrappedStack wrappedStack = null;
if (jsonObject.has(TYPE_ITEM_STACK)) { if (jsonObject.has(TYPE_ITEM_STACK)) {
wrappedStack = WrappedStack.wrap(context.deserialize(jsonObject.get(TYPE_ITEM_STACK), ItemStack.class));
try {
ItemStack itemStack = context.deserialize(jsonObject.get(TYPE_ITEM_STACK), ItemStack.class);
wrappedStack = WrappedStack.wrap(itemStack);
}
catch (JsonParseException e) {
// TODO Logging
}
} }
else if (jsonObject.has(TYPE_ORE_STACK)) { else if (jsonObject.has(TYPE_ORE_STACK)) {
wrappedStack = WrappedStack.wrap(context.deserialize(jsonObject.get(TYPE_ORE_STACK), OreStack.class));
try {
OreStack oreStack = context.deserialize(jsonObject.get(TYPE_ORE_STACK), OreStack.class);
wrappedStack = WrappedStack.wrap(oreStack);
}
catch (JsonParseException e) {
// TODO Logging
}
} }
else if (jsonObject.has(TYPE_FLUID_STACK)) { else if (jsonObject.has(TYPE_FLUID_STACK)) {
wrappedStack = WrappedStack.wrap(context.deserialize(jsonObject.get(TYPE_FLUID_STACK), FluidStack.class));
try {
FluidStack fluidStack = context.deserialize(jsonObject.get(TYPE_FLUID_STACK), FluidStack.class);
wrappedStack = WrappedStack.wrap(fluidStack);
}
catch (JsonParseException e) {
// TODO Logging
}
} }
if (wrappedStack != null) { if (wrappedStack != null) {