From 1c4cc85886c1fba6fdf36a289468b6ccc42dd671 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Fri, 5 May 2017 18:45:59 +0200 Subject: [PATCH] Fixes #1190 - "Server crashes randomly on block.refinedstorage:fluid_interface" --- CHANGELOG.md | 5 +++++ .../refinedstorage/apiimpl/storage/StorageCacheFluid.java | 5 ++--- .../refinedstorage/apiimpl/storage/StorageCacheItem.java | 5 ++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f7c3709e..12339a9b4 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Refined Storage Changelog +### 1.4.5 +- Fixed Crafting Tweaks buttons positioned wrongly (blay09) +- Fixed Crafting Tweaks keybindings interfering with RS keybindings (blay09) +- Fixed crash when updating storages (raoulvdberge) + ### 1.4.4 - Updated Forge to 2284 (raoulvdberge) - Fixed Disk Manipulator crashing due to empty stack (raoulvdberge) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheFluid.java index eab20e081..2c1bdf503 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheFluid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheFluid.java @@ -11,13 +11,12 @@ import com.raoulvdberge.refinedstorage.apiimpl.API; import net.minecraftforge.fluids.FluidStack; import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; public class StorageCacheFluid implements IStorageCache { private INetworkMaster network; - private List> storages = Collections.synchronizedList(new ArrayList<>()); + private List> storages = new CopyOnWriteArrayList<>(); private IStackList list = API.instance().createFluidStackList(); public StorageCacheFluid(INetworkMaster network) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheItem.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheItem.java index 9021c3b71..09344660a 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageCacheItem.java @@ -11,13 +11,12 @@ import com.raoulvdberge.refinedstorage.apiimpl.API; import net.minecraft.item.ItemStack; import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; public class StorageCacheItem implements IStorageCache { private INetworkMaster network; - private List> storages = Collections.synchronizedList(new ArrayList<>()); + private List> storages = new CopyOnWriteArrayList<>(); private IStackList list = API.instance().createItemStackList(); public StorageCacheItem(INetworkMaster network) {