diff options
| author | Technus <daniel112092@gmail.com> | 2017-12-17 10:03:12 +0100 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-12-17 10:03:12 +0100 |
| commit | fa1d0c65a18f0b38af7f7d049f74c3d9e37c8669 (patch) | |
| tree | 4a8fa44e3efb48cd307af52e15a4233fdcf89b62 /src/main/java | |
| parent | a7370e61a4fe902e29304ca12943fc6b22eaadd8 (diff) | |
| download | GT5-Unofficial-fa1d0c65a18f0b38af7f7d049f74c3d9e37c8669.tar.gz GT5-Unofficial-fa1d0c65a18f0b38af7f7d049f74c3d9e37c8669.tar.bz2 GT5-Unofficial-fa1d0c65a18f0b38af7f7d049f74c3d9e37c8669.zip | |
Fix it
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java index ee93b7df98..e34d690732 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java @@ -171,18 +171,16 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa @Override public void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) { if(aBaseMetaTileEntity.isServerSide()) { - if (totalComputationRemaining > 0) { + if (totalComputationRemaining > 0 && objectResearched!=null) { eRecipe = null; - if (objectResearched != null) { - if (ItemList.Tool_DataOrb.isStackEqual(mInventory[1], false, true)) { - eRecipe = TT_recipe.TT_Recipe_Map_EM.sMachineRecipesEM.findRecipe(objectResearched.definition); + if (ItemList.Tool_DataOrb.isStackEqual(mInventory[1], false, true)) { + eRecipe = TT_recipe.TT_Recipe_Map_EM.sMachineRecipesEM.findRecipe(objectResearched.definition); + if (eRecipe != null) { + machineType = machine; + } else { + eRecipe = TT_recipe.TT_Recipe_Map_EM.sCrafterRecipesEM.findRecipe(objectResearched.definition); if (eRecipe != null) { - machineType = machine; - } else { - eRecipe = TT_recipe.TT_Recipe_Map_EM.sCrafterRecipesEM.findRecipe(objectResearched.definition); - if (eRecipe != null) { - machineType = crafter; - } + machineType = crafter; } } } |