diff --git a/src/com/dre/brewery/BIngredients.java b/src/com/dre/brewery/BIngredients.java index 6f13245..fa9d141 100644 --- a/src/com/dre/brewery/BIngredients.java +++ b/src/com/dre/brewery/BIngredients.java @@ -471,13 +471,15 @@ public class BIngredients { List ing = new ArrayList<>(size); for (; size > 0; size--) { ItemLoader itemLoader = new ItemLoader(dataVersion, in, in.readUTF()); - if (Ingredient.LOADERS.containsKey(itemLoader.getSaveID())) { - Ingredient loaded = Ingredient.LOADERS.get(itemLoader.getSaveID()).apply(itemLoader); - int amount = in.readShort(); - if (loaded != null) { - loaded.setAmount(amount); - ing.add(loaded); - } + if (!Ingredient.LOADERS.containsKey(itemLoader.getSaveID())) { + P.p.errorLog("Ingredient Loader not found: " + itemLoader.getSaveID()); + break; + } + Ingredient loaded = Ingredient.LOADERS.get(itemLoader.getSaveID()).apply(itemLoader); + int amount = in.readShort(); + if (loaded != null) { + loaded.setAmount(amount); + ing.add(loaded); } } return new BIngredients(ing, cookedTime); diff --git a/src/com/dre/brewery/recipe/SimpleItem.java b/src/com/dre/brewery/recipe/SimpleItem.java index db3a7a4..80f984c 100644 --- a/src/com/dre/brewery/recipe/SimpleItem.java +++ b/src/com/dre/brewery/recipe/SimpleItem.java @@ -132,8 +132,9 @@ public class SimpleItem extends RecipeItem implements Ingredient { try { DataInputStream in = loader.getInputStream(); Material mat = Material.getMaterial(in.readUTF()); + short dur = in.readShort(); if (mat != null) { - SimpleItem item = new SimpleItem(mat, in.readShort()); + SimpleItem item = new SimpleItem(mat, dur); return item; } } catch (IOException e) {