aboutsummaryrefslogtreecommitdiff
path: root/main/java/gregtech/common/tileentities/automation
diff options
context:
space:
mode:
Diffstat (limited to 'main/java/gregtech/common/tileentities/automation')
-rw-r--r--main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java b/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
index 4101e2f5a8..7af20757dd 100644
--- a/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
+++ b/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
@@ -139,7 +139,9 @@ public class GT_MetaTileEntity_TypeFilter
{
boolean tAllowPrefix = this.mPrefix.contains(aStack);
if(this.mPrefix==OrePrefixes.ore){
- OrePrefixes tFix = GT_OreDictUnificator.getItemData(aStack).mPrefix;
+ ItemData tData = GT_OreDictUnificator.getItemData(aStack);
+ if(tData!=null&&tData.mPrefix!=null){
+ OrePrefixes tFix = tData.mPrefix;
if(tFix==OrePrefixes.oreBlackgranite||
tFix==OrePrefixes.oreDense||
tFix==OrePrefixes.oreEnd||
@@ -151,7 +153,7 @@ public class GT_MetaTileEntity_TypeFilter
tFix==OrePrefixes.oreRedgranite||
tFix==OrePrefixes.oreRich||
tFix==OrePrefixes.oreSmall)tAllowPrefix=true;
- }
+ }}
return (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) && ((this.bNBTAllowed) || (!aStack.hasTagCompound())) && (tAllowPrefix != this.bInvertFilter);
}
}