maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Return a dummy when recipe deserialization fails. Closes #2563. (#2565). Thanks to Technici4n

Browse source
This commit is contained in:
Technici4n 2021-10-08 00:00:22 +02:00 committed by GitHub
parent 2d9cdfbdc9
commit 0ddf6688c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
RebornCore/src/main/java/reborncore/common/crafting/RebornRecipeType.java
View file

@ -49,21 +49,24 @@ public record RebornRecipeType<R extends RebornRecipe>(
throw new RuntimeException("RebornRecipe type not supported!");
}
R recipe = newRecipe(recipeId);
try {
R recipe = newRecipe(recipeId);
if (!ConditionManager.shouldLoadRecipe(json)) {
recipe.makeDummy();
return recipe;
}
recipe.deserialize(json);
return recipe;
} catch (Throwable t) {
t.printStackTrace();
RebornCore.LOGGER.error("Failed to read recipe: " + recipeId);
RebornCore.LOGGER.error("Failed to read recipe: " + recipeId, t);
// Make a new recipe - don't reuse the existing recipe object because it might be in an invalid state if an
// exception was thrown in the middle of its deserialization.
R recipe = newRecipe(recipeId);
recipe.makeDummy();
return recipe;
}
return recipe;
}
public JsonObject toJson(R recipe) {