dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash log when opening world with Crafting/Pattern Grid

Browse Source
This commit is contained in:
raoulvdberge
2019-10-13 15:45:07 +02:00
parent d5f45d51aa
commit 33a6e8a56e
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/GridNetworkNode.java
View File

@@ -95,6 +95,8 @@ public class GridNetworkNode extends NetworkNode implements IGridNetworkAware, I
private BaseItemHandler processingMatrix = new BaseItemHandler(9 * 2, new NetworkNodeListener(this)); private BaseItemHandler processingMatrix = new BaseItemHandler(9 * 2, new NetworkNodeListener(this));
private FluidInventory processingMatrixFluids = new FluidInventory(9 * 2, FluidAttributes.BUCKET_VOLUME * 64, new NetworkNodeListener(this)); private FluidInventory processingMatrixFluids = new FluidInventory(9 * 2, FluidAttributes.BUCKET_VOLUME * 64, new NetworkNodeListener(this));
private boolean reading;
private Set<ICraftingGridListener> craftingListeners = new HashSet<>(); private Set<ICraftingGridListener> craftingListeners = new HashSet<>();
private BaseItemHandler patterns = new BaseItemHandler(2, new NetworkNodeListener(this), new ItemValidatorBasic(RSItems.PATTERN)) { private BaseItemHandler patterns = new BaseItemHandler(2, new NetworkNodeListener(this), new ItemValidatorBasic(RSItems.PATTERN)) {
@@ -332,8 +334,10 @@ public class GridNetworkNode extends NetworkNode implements IGridNetworkAware, I
craftingListeners.forEach(ICraftingGridListener::onCraftingMatrixChanged); craftingListeners.forEach(ICraftingGridListener::onCraftingMatrixChanged);
if (!reading) {
markDirty(); markDirty();
} }
}
@Override @Override
public void onRecipeTransfer(PlayerEntity player, ItemStack[][] recipe) { public void onRecipeTransfer(PlayerEntity player, ItemStack[][] recipe) {
@@ -672,6 +676,8 @@ public class GridNetworkNode extends NetworkNode implements IGridNetworkAware, I
public void read(CompoundNBT tag) { public void read(CompoundNBT tag) {
super.read(tag); super.read(tag);
reading = true;
StackUtils.readItems(matrix, 0, tag); StackUtils.readItems(matrix, 0, tag);
StackUtils.readItems(patterns, 1, tag); StackUtils.readItems(patterns, 1, tag);
StackUtils.readItems(filter, 2, tag); StackUtils.readItems(filter, 2, tag);
@@ -688,6 +694,8 @@ public class GridNetworkNode extends NetworkNode implements IGridNetworkAware, I
if (tag.contains(NBT_TAB_PAGE)) { if (tag.contains(NBT_TAB_PAGE)) {
tabPage = tag.getInt(NBT_TAB_PAGE); tabPage = tag.getInt(NBT_TAB_PAGE);
} }
reading = false;
} }
@Override @Override