upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-13 00:37:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a couple more ItemStack null checks (#3586)

Browse Source
This commit is contained in:
Ben Staddon authored and LexManos committed 2017-01-11 15:15:47 -08:00
1 parent 43f3b3ec65
commit c4dea9fc66
2 files changed
+5 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/net/minecraftforge/client/GuiIngameForge.java
+4 -3
View File
@@ -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);
}
}
src/main/java/net/minecraftforge/fluids/UniversalBucket.java
+1 -1
View File
@@ -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())))
{