From 275729d54ea783aba32929f0a91a7ac32107a4f2 Mon Sep 17 00:00:00 2001 From: TheWhiteWolves Date: Thu, 21 Jan 2016 23:13:41 +0000 Subject: [PATCH] Popped a null check in onEquipped() to ensure player isn't null, hopefully helps with Issue #1757 --- .../common/item/equipment/bauble/ItemBauble.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 77bd4604a..f8d75a891 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -129,14 +129,16 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt @Override public void onEquipped(ItemStack stack, EntityLivingBase player) { - if(!player.worldObj.isRemote) - player.worldObj.playSoundAtEntity(player, "botania:equipBauble", 0.1F, 1.3F); + if(player != null) { + if(!player.worldObj.isRemote) + player.worldObj.playSoundAtEntity(player, "botania:equipBauble", 0.1F, 1.3F); - if(player instanceof EntityPlayer) - ((EntityPlayer) player).addStat(ModAchievements.baubleWear, 1); + if(player instanceof EntityPlayer) + ((EntityPlayer) player).addStat(ModAchievements.baubleWear, 1); - onEquippedOrLoadedIntoWorld(stack, player); - setLastPlayerHashcode(stack, player.hashCode()); + onEquippedOrLoadedIntoWorld(stack, player); + setLastPlayerHashcode(stack, player.hashCode()); + } } public void onEquippedOrLoadedIntoWorld(ItemStack stack, EntityLivingBase player) {