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

Fixed item and fluid storage stored count having incorrect values, fixes #283

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-08-30 02:30:39 +02:00
parent 4a750c3352
commit c4c54d6648
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -3,6 +3,7 @@
### 1.0 ### 1.0
- Implemented multithreaded autocrafting (raoulvdberge) - Implemented multithreaded autocrafting (raoulvdberge)
- Processing patterns now hold their items back for pushing until all the required items are gathered from the system (raoulvdberge) - Processing patterns now hold their items back for pushing until all the required items are gathered from the system (raoulvdberge)
- Fixed item and fluid storage stored count having incorrect values (raoulvdberge)
### 0.9.4 ### 0.9.4
- Little fixes in German translation (ThexXTURBOXx) - Little fixes in German translation (ThexXTURBOXx)

4
src/main/java/refinedstorage/apiimpl/storage/fluid/FluidStorageNBT.java
View File

@@ -78,7 +78,7 @@ public abstract class FluidStorageNBT implements IFluidStorage {
} }
@Override @Override
public FluidStack insertFluid(FluidStack stack, int size, boolean simulate) { public synchronized FluidStack insertFluid(FluidStack stack, int size, boolean simulate) {
for (FluidStack otherStack : stacks) { for (FluidStack otherStack : stacks) {
if (otherStack.isFluidEqual(stack)) { if (otherStack.isFluidEqual(stack)) {
if (getCapacity() != -1 && getStored() + size > getCapacity()) { if (getCapacity() != -1 && getStored() + size > getCapacity()) {
@@ -141,7 +141,7 @@ public abstract class FluidStorageNBT implements IFluidStorage {
} }
@Override @Override
public FluidStack extractFluid(FluidStack stack, int size, int flags) { public synchronized FluidStack extractFluid(FluidStack stack, int size, int flags) {
for (FluidStack otherStack : stacks) { for (FluidStack otherStack : stacks) {
if (CompareUtils.compareStack(otherStack, stack, flags)) { if (CompareUtils.compareStack(otherStack, stack, flags)) {
if (size > otherStack.amount) { if (size > otherStack.amount) {

4
src/main/java/refinedstorage/apiimpl/storage/item/ItemStorageNBT.java
View File

@@ -115,7 +115,7 @@ public abstract class ItemStorageNBT implements IItemStorage {
} }
@Override @Override
public ItemStack insertItem(ItemStack stack, int size, boolean simulate) { public synchronized ItemStack insertItem(ItemStack stack, int size, boolean simulate) {
for (ItemStack otherStack : stacks) { for (ItemStack otherStack : stacks) {
if (CompareUtils.compareStackNoQuantity(otherStack, stack)) { if (CompareUtils.compareStackNoQuantity(otherStack, stack)) {
if (getCapacity() != -1 && getStored() + size > getCapacity()) { if (getCapacity() != -1 && getStored() + size > getCapacity()) {
@@ -178,7 +178,7 @@ public abstract class ItemStorageNBT implements IItemStorage {
} }
@Override @Override
public ItemStack extractItem(ItemStack stack, int size, int flags) { public synchronized ItemStack extractItem(ItemStack stack, int size, int flags) {
for (ItemStack otherStack : stacks) { for (ItemStack otherStack : stacks) {
if (CompareUtils.compareStack(otherStack, stack, flags)) { if (CompareUtils.compareStack(otherStack, stack, flags)) {
if (size > otherStack.stackSize) { if (size > otherStack.stackSize) {