diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-07-15 16:52:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-15 16:52:01 +0200 |
| commit | a95b3edc584f77fdb4eb4e8ddbfc04dbc91be241 (patch) | |
| tree | 58916cb4487aef3387e7e6d86cb3ad1d3e42a6b2 /src/main/java/gregtech/common/tileentities/machines/multi | |
| parent | b0b591089c9ae646506770e92efeee074598b49b (diff) | |
| parent | 77f22e029303ba48f9aabad32367e500bdcefee3 (diff) | |
| download | GT5-Unofficial-a95b3edc584f77fdb4eb4e8ddbfc04dbc91be241.tar.gz GT5-Unofficial-a95b3edc584f77fdb4eb4e8ddbfc04dbc91be241.tar.bz2 GT5-Unofficial-a95b3edc584f77fdb4eb4e8ddbfc04dbc91be241.zip | |
Merge pull request #597 from TimeConqueror/experimental
Improvements to Vanilla Replacement & GT_Utility#copy
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines/multi')
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java index d7b7e2aa4d..a57a237060 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java @@ -207,7 +207,7 @@ public abstract class GT_MetaTileEntity_DrillerBase extends GT_MetaTileEntity_Mu if (!storedItem.isItemEqual(miningPipe)) continue; if (pipes == null) { - setInventorySlotContents(1, GT_Utility.copy(miningPipe)); + setInventorySlotContents(1, GT_Utility.copyOrNull(miningPipe)); pipes = getStackInSlot(1); } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java index f1b304a1b1..eab4e9c896 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java @@ -282,7 +282,7 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn for (int i = 0; i < limit; i++) { int absi = INPUT_SLOTS + i; if (this.mInventory[absi] == null) { - this.mInventory[absi] = GT_Utility.copy(this.mOutputItems[i]); + this.mInventory[absi] = GT_Utility.copyOrNull(this.mOutputItems[i]); } else if (GT_Utility.areStacksEqual(this.mInventory[absi], this.mOutputItems[i])) { this.mInventory[absi].stackSize = Math.min(this.mInventory[absi].getMaxStackSize(), this.mInventory[absi].stackSize + this.mOutputItems[i].stackSize); |