diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core/item')
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/general/ItemAirFilter.java | 5 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemAirFilter.java b/src/Java/gtPlusPlus/core/item/general/ItemAirFilter.java index 1596b5985b..04c5dc68e1 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemAirFilter.java +++ b/src/Java/gtPlusPlus/core/item/general/ItemAirFilter.java @@ -52,6 +52,11 @@ public class ItemAirFilter extends Item { @Override public String getItemStackDisplayName(final ItemStack tItem) { + + if (tItem == null) { + return "Air Filter"; + } + String itemName = tItem == null ? "Air Filter" : super.getItemStackDisplayName(tItem); String suffixName = ""; if (tItem.getItemDamage() == 0){ diff --git a/src/Java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java b/src/Java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java index a7f80bd244..bc162140b1 100644 --- a/src/Java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java +++ b/src/Java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java @@ -182,7 +182,7 @@ public class ItemEntityCatcher extends Item implements IEntityCatcher { public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { if (hasEntity(p_77624_1_)){ String mName = NBTUtils.getString(p_77624_1_,"mEntityName"); - if (mName != null && !mName.equals("") && mName != ""){ + if (mName != null && !mName.equals("")){ p_77624_3_.add(EnumChatFormatting.GRAY+"Contains a "+mName+"."); } } |