aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2017-07-01 22:59:27 +0200
committerDream-Master <dream-master@gmx.net>2017-07-01 22:59:27 +0200
commitc9d143126ec634c1dc2447802e5b50e77e1116c8 (patch)
treeafbdef6c323056dcdf398752e5432d4ca2b8186e /src/main/java
parentc56e1b2814371b554c0c45b7ba1397e060a8c487 (diff)
downloadGT5-Unofficial-c9d143126ec634c1dc2447802e5b50e77e1116c8.tar.gz
GT5-Unofficial-c9d143126ec634c1dc2447802e5b50e77e1116c8.tar.bz2
GT5-Unofficial-c9d143126ec634c1dc2447802e5b50e77e1116c8.zip
cherry pick
026fcfcbbadc8c3163f13b64192fed6ea05343fc Clean reset of Datastick so remaining old data does not break assemblyline.
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
index bbf6be7519..8422c6abf3 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
@@ -94,7 +94,7 @@ public class GT_MetaTileEntity_Scanner
if (ItemList.Tool_DataOrb.isStackEqual(getSpecialSlot(), false, true)) {
if (ItemList.Tool_DataOrb.isStackEqual(aStack, false, true)) {
aStack.stackSize -= 1;
- this.mOutputItems[0] = GT_Utility.copyAmount(1L, new Object[]{getSpecialSlot()});
+ this.mOutputItems[0] = GT_Utility.copyAmount(1L, new Object[]{ItemList.Tool_DataStick.get(1, new Object[]{})});
calculateOverclockedNess(32,512);
//In case recipe is too OP for that machine
if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1)