diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2015-12-09 00:52:00 +0100 |
|---|---|---|
| committer | Blood-Asp <bloodasphendrik@gmail.com> | 2015-12-09 00:52:00 +0100 |
| commit | d415df7ea26c0424abf8df9797fb1c4467c62d12 (patch) | |
| tree | 412dc40b356adf727637c7a9633fa039e7ae19f5 /src/main/java/gregtech/common/tileentities | |
| parent | 46f4473de67d66676f3ecc36c6e441db3d1eebfe (diff) | |
| download | GT5-Unofficial-d415df7ea26c0424abf8df9797fb1c4467c62d12.tar.gz GT5-Unofficial-d415df7ea26c0424abf8df9797fb1c4467c62d12.tar.bz2 GT5-Unofficial-d415df7ea26c0424abf8df9797fb1c4467c62d12.zip | |
merge of GT5.09 fixes into 5.08 branch
Diffstat (limited to 'src/main/java/gregtech/common/tileentities')
2 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java index c49fe6fe05..10d045d515 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java @@ -244,7 +244,7 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity if (tierOverclock() == 2) { return mStartEnergy < 160000000 ? 2 : 1; } - return mStartEnergy < 160000000 ? 4 : mStartEnergy > 320000000 ? 2 : 1; + return mStartEnergy < 160000000 ? 4 : mStartEnergy < 320000000 ? 2 : 1; } @Override diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java index a05ca2baf4..0ae5a783f8 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java +++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java @@ -136,6 +136,7 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_TieredMach } if (this.mItemStack != null) { this.mInventory[2] = this.mItemStack.copy(); + this.mInventory[2].stackSize = Math.min(mItemStack.getMaxStackSize(), this.mItemCount); } else { this.mInventory[2] = null; } @@ -164,12 +165,12 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_TieredMach @Override public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { - return true; + return aIndex==1; } @Override public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { - return true; + return aIndex==0&&(mInventory[0]==null||GT_Utility.areStacksEqual(this.mInventory[0], aStack)); } @Override |