From 0737afbe0ba4710f5110ea659700c2ca9717c434 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 9 Oct 2016 20:06:16 +0200 Subject: [PATCH] Fix cached item count for display going negative, fixes #343 --- .../apiimpl/storage/fluid/GroupedFluidStorage.java | 6 +++--- .../apiimpl/storage/item/GroupedItemStorage.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/refinedstorage/apiimpl/storage/fluid/GroupedFluidStorage.java b/src/main/java/refinedstorage/apiimpl/storage/fluid/GroupedFluidStorage.java index 980a237bf..af7248f67 100755 --- a/src/main/java/refinedstorage/apiimpl/storage/fluid/GroupedFluidStorage.java +++ b/src/main/java/refinedstorage/apiimpl/storage/fluid/GroupedFluidStorage.java @@ -22,7 +22,7 @@ public class GroupedFluidStorage implements IGroupedFluidStorage { } @Override - public void rebuild() { + public synchronized void rebuild() { storages.clear(); network.getNodeGraph().all().stream() @@ -41,7 +41,7 @@ public class GroupedFluidStorage implements IGroupedFluidStorage { } @Override - public void add(@Nonnull FluidStack stack, boolean rebuilding) { + public synchronized void add(@Nonnull FluidStack stack, boolean rebuilding) { list.add(stack); if (!rebuilding) { @@ -50,7 +50,7 @@ public class GroupedFluidStorage implements IGroupedFluidStorage { } @Override - public void remove(@Nonnull FluidStack stack) { + public synchronized void remove(@Nonnull FluidStack stack) { if (list.remove(stack, true)) { network.sendFluidStorageDeltaToClient(stack, -stack.amount); } diff --git a/src/main/java/refinedstorage/apiimpl/storage/item/GroupedItemStorage.java b/src/main/java/refinedstorage/apiimpl/storage/item/GroupedItemStorage.java index 17cca61de..5c9bdf487 100755 --- a/src/main/java/refinedstorage/apiimpl/storage/item/GroupedItemStorage.java +++ b/src/main/java/refinedstorage/apiimpl/storage/item/GroupedItemStorage.java @@ -23,7 +23,7 @@ public class GroupedItemStorage implements IGroupedItemStorage { } @Override - public void rebuild() { + public synchronized void rebuild() { storages.clear(); network.getNodeGraph().all().stream() @@ -50,7 +50,7 @@ public class GroupedItemStorage implements IGroupedItemStorage { } @Override - public void add(@Nonnull ItemStack stack, boolean rebuilding) { + public synchronized void add(@Nonnull ItemStack stack, boolean rebuilding) { list.add(stack); if (!rebuilding) { @@ -59,7 +59,7 @@ public class GroupedItemStorage implements IGroupedItemStorage { } @Override - public void remove(@Nonnull ItemStack stack) { + public synchronized void remove(@Nonnull ItemStack stack) { if (list.remove(stack, !network.hasPattern(stack))) { network.sendItemStorageDeltaToClient(stack, -stack.stackSize); }