diff options
| author | â€huajijam <strhuaji@gmail.com> | 2019-04-24 17:26:22 +0800 |
|---|---|---|
| committer | â€huajijam <strhuaji@gmail.com> | 2019-04-24 17:26:22 +0800 |
| commit | de9f7710d6f32af0d941085e1029a106b5bc22ff (patch) | |
| tree | 71918df2e7294d96a2c3dd81dd02cc4b872fe111 /src/Java/gtPlusPlus/core/item/general | |
| parent | f004369537bf82a3318f2d315af530944433dac5 (diff) | |
| parent | ea049ad62ba64a414fccfa5cbb875d72e7e94d00 (diff) | |
| download | GT5-Unofficial-de9f7710d6f32af0d941085e1029a106b5bc22ff.tar.gz GT5-Unofficial-de9f7710d6f32af0d941085e1029a106b5bc22ff.tar.bz2 GT5-Unofficial-de9f7710d6f32af0d941085e1029a106b5bc22ff.zip | |
Automatic synchronization
Diffstat (limited to 'src/Java/gtPlusPlus/core/item/general')
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java b/src/Java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java index 9467c3a58c..e8f76ce64c 100644 --- a/src/Java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java +++ b/src/Java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java @@ -12,6 +12,7 @@ import gtPlusPlus.core.item.base.CoreItem; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.NBTUtils; +import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -51,7 +52,7 @@ public class ItemThrowableBomb extends CoreItem { for (ItemStack aPlaySlot : player.inventory.mainInventory) { if (aPlaySlot != null) { for (ItemStack aLighter : mLighters) { - if (GT_Utility.areStacksEqual(aPlaySlot, aLighter)) { + if (GT_Utility.areStacksEqual(aPlaySlot, aLighter) || (aPlaySlot.getItem() instanceof MetaGeneratedGregtechTools && aPlaySlot.getItemDamage() == MetaGeneratedGregtechTools.ELECTRIC_LIGHTER)) { hasLighter = true; break; } |