Fix a couple more ItemStack null checks (#3586)
This commit is contained in:
parent
43f3b3ec65
commit
c4dea9fc66
|
@ -253,15 +253,16 @@ public class GuiIngameForge extends GuiIngame
|
|||
|
||||
ItemStack itemstack = this.mc.player.inventory.armorItemInSlot(3);
|
||||
|
||||
if (this.mc.gameSettings.thirdPersonView == 0 && itemstack != null && itemstack.getItem() != null)
|
||||
if (this.mc.gameSettings.thirdPersonView == 0 && !itemstack.isEmpty())
|
||||
{
|
||||
if (itemstack.getItem() == Item.getItemFromBlock(Blocks.PUMPKIN))
|
||||
Item item = itemstack.getItem();
|
||||
if (item == Item.getItemFromBlock(Blocks.PUMPKIN))
|
||||
{
|
||||
renderPumpkinOverlay(res);
|
||||
}
|
||||
else
|
||||
{
|
||||
itemstack.getItem().renderHelmetOverlay(itemstack, mc.player, res, partialTicks);
|
||||
item.renderHelmetOverlay(itemstack, mc.player, res, partialTicks);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -217,7 +217,7 @@ public class UniversalBucket extends Item
|
|||
|
||||
// not for us to handle
|
||||
ItemStack emptyBucket = event.getEmptyBucket();
|
||||
if (emptyBucket == null ||
|
||||
if (emptyBucket.isEmpty() ||
|
||||
!emptyBucket.isItemEqual(getEmpty()) ||
|
||||
(isNbtSensitive() && ItemStack.areItemStackTagsEqual(emptyBucket, getEmpty())))
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue