diff options
| author | Technus <daniel112092@gmail.com> | 2017-12-31 11:45:54 +0100 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-12-31 11:45:54 +0100 |
| commit | 49122ffb2da78539ca1d29ffa429f6482f5dcaec (patch) | |
| tree | e23888d95b7adc13aef60571402015af93f97435 /src/main/java/gregtech/common/tileentities | |
| parent | fa7cdaaf86c061fe59f940ebb6005926b515ab96 (diff) | |
| download | GT5-Unofficial-49122ffb2da78539ca1d29ffa429f6482f5dcaec.tar.gz GT5-Unofficial-49122ffb2da78539ca1d29ffa429f6482f5dcaec.tar.bz2 GT5-Unofficial-49122ffb2da78539ca1d29ffa429f6482f5dcaec.zip | |
Fix UO blacklist
Diffstat (limited to 'src/main/java/gregtech/common/tileentities')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java index 7054e194f7..5d96f05afd 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java @@ -51,11 +51,12 @@ public class GT_MetaTileEntity_SeismicProspector extends GT_MetaTileEntity_Basic public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { if (aBaseMetaTileEntity.isServerSide()) { ItemStack aStack = aPlayer.getCurrentEquippedItem(); + ItemData stackData= GT_OreDictUnificator.getItemData(aStack); if (!ready && (aStack != null) && ( (aStack.getItem() == Item.getItemFromBlock(Blocks.tnt) && aStack.stackSize > 1 ) || (aStack.getItem() == Ic2Items.industrialTnt.getItem() && aStack.stackSize > 0 ) || (aStack.getItem() == Ic2Items.dynamite.getItem() && aStack.stackSize > 3 ) || - (GT_OreDictUnificator.getItemData(aStack).mMaterial.mMaterial == Materials.Glyceryl && aStack.stackSize > 0 ) || + (stackData!=null && stackData.mMaterial.mMaterial == Materials.Glyceryl && aStack.stackSize > 0 ) || (aStack.getItem() == ItemList.Block_Powderbarrel.getItem() && aStack.getItemDamage()==ItemList.Block_Powderbarrel.get(1).getItemDamage() && aStack.stackSize > 7 ) ) ) { if ((!aPlayer.capabilities.isCreativeMode) && (aStack.stackSize != 111)) { |