aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/block/general
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2017-11-25 15:25:40 +1000
committerAlkalus <draknyte1@hotmail.com>2017-11-25 15:25:40 +1000
commitecbe25305fedc7119d034abc68547ebfed8b6725 (patch)
treeefdb08ae33d7450a484f395fa5e224d174207e39 /src/Java/gtPlusPlus/core/block/general
parentb5fd7c514de976e5f0b550e751ae3a73001ac67e (diff)
downloadGT5-Unofficial-ecbe25305fedc7119d034abc68547ebfed8b6725.tar.gz
GT5-Unofficial-ecbe25305fedc7119d034abc68547ebfed8b6725.tar.bz2
GT5-Unofficial-ecbe25305fedc7119d034abc68547ebfed8b6725.zip
$ More Fixes to the Xp Converter.
Diffstat (limited to 'src/Java/gtPlusPlus/core/block/general')
-rw-r--r--src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java19
1 files changed, 8 insertions, 11 deletions
diff --git a/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java b/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
index 97a9ff2af6..e4270061cb 100644
--- a/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
+++ b/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
@@ -4,7 +4,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.interfaces.IToolStats;
import gregtech.common.items.GT_MetaGenerated_Tool_01;
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.item.base.itemblock.ItemBlockEntityBase;
@@ -75,17 +74,15 @@ public class BlockTankXpConverter extends BlockContainer {
boolean mDidScrewDriver = false;
//Check For Screwdriver
try {
- final ItemStack mHandStack = PlayerUtils.getItemStackInPlayersHand(player);
- final Item mHandItem = PlayerUtils.getItemInPlayersHand(player);
- if (mHandItem instanceof IToolStats){
- if (((mHandItem instanceof GT_MetaGenerated_Tool_01) && ((mHandItem.getDamage(mHandStack) == 22) || (mHandItem.getDamage(mHandStack) == 150)))){
- final TileEntityXpConverter tile = (TileEntityXpConverter) world.getTileEntity(x, y, z);
- if (tile != null){
- mDidScrewDriver = true;
- tile.onScrewdriverRightClick((byte) side, player, x, y, z);
- }
-
+ final ItemStack mHandStack = PlayerUtils.getItemStackInPlayersHand(world, player.getDisplayName());
+ final Item mHandItem = mHandStack.getItem();
+ if (((mHandItem instanceof GT_MetaGenerated_Tool_01) && ((mHandItem.getDamage(mHandStack) == 22) || (mHandItem.getDamage(mHandStack) == 150)))){
+ final TileEntityXpConverter tile = (TileEntityXpConverter) world.getTileEntity(x, y, z);
+ if (tile != null){
+ mDidScrewDriver = true;
+ tile.onScrewdriverRightClick((byte) side, player, x, y, z);
}
+
}
}
catch (final Throwable t){