diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-08-07 23:11:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-07 23:11:49 +0200 |
| commit | bdbdabf92eb756b886a851bfdf4a0022745c7a1d (patch) | |
| tree | b428db95dc0ad6db8268684abd9f59124c3bbb97 /src/main/java/gregtech/api/metatileentity/implementations | |
| parent | 540ad9ce4c223a37affb24c8c1b1b0d551afe61c (diff) | |
| parent | 0c5284cdff6a2bc8e9e409e61d0a290b1ea3b9d0 (diff) | |
| download | GT5-Unofficial-bdbdabf92eb756b886a851bfdf4a0022745c7a1d.tar.gz GT5-Unofficial-bdbdabf92eb756b886a851bfdf4a0022745c7a1d.tar.bz2 GT5-Unofficial-bdbdabf92eb756b886a851bfdf4a0022745c7a1d.zip | |
Merge pull request #629 from D-Cysteine/fix-chest-buffer-infinite-loop
Fix chest buffer infinite loop
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java index faea347c67..21cf0d73f1 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java @@ -329,20 +329,18 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM } protected void fillStacksIntoFirstSlots() { - if (bSortStacks) { - for (int i = 0; i < mInventory.length - 1; i++) { - if (!isValidSlot(i)) { + for (int i = 0; i < mInventory.length - 1; i++) { + if (!isValidSlot(i)) { + continue; + } + + for (int j = i + 1; j < mInventory.length; j++) { + if (!isValidSlot(j)) { continue; } - for (int j = i + 1; j < mInventory.length; j++) { - if (!isValidSlot(j)) { - continue; - } - - if (mInventory[j] != null && (mInventory[i] == null || GT_Utility.areStacksEqual(mInventory[i], mInventory[j]))) - GT_Utility.moveStackFromSlotAToSlotB(getBaseMetaTileEntity(), getBaseMetaTileEntity(), j, i, (byte) 64, (byte) 1, (byte) 64, (byte) 1); - } + if (mInventory[j] != null && (mInventory[i] == null || GT_Utility.areStacksEqual(mInventory[i], mInventory[j]))) + GT_Utility.moveStackFromSlotAToSlotB(getBaseMetaTileEntity(), getBaseMetaTileEntity(), j, i, (byte) 64, (byte) 1, (byte) 64, (byte) 1); } } } |