upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-10-26 14:33:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix npe in potionlauncher closes #537

Browse Source
This commit is contained in:
Progwml6 committed 2014-03-28 01:37:13 -04:00
1 parent 82cacb0b6e
commit 46aa5a0fb5
1 file changed
+16 -13
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/tconstruct/items/tools/PotionLauncher.java
+16 -13
View File
@@ -135,24 +135,27 @@ public class PotionLauncher extends Item
@Override
public boolean onEntitySwing (EntityLivingBase player, ItemStack stack)
{
NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool");
if (tags.getBoolean("Loaded"))
if (stack != null && stack.hasTagCompound())
{
NBTTagCompound potionTag = tags.getCompoundTag("LoadedPotion");
ItemStack potion = ItemStack.loadItemStackFromNBT(potionTag);// findPotion(player);InventoryLogic
if (potion != null)
NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool");
if (tags.getBoolean("Loaded"))
{
World world = player.worldObj;
world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F));
if (!world.isRemote)
NBTTagCompound potionTag = tags.getCompoundTag("LoadedPotion");
ItemStack potion = ItemStack.loadItemStackFromNBT(potionTag);// findPotion(player);InventoryLogic
if (potion != null)
{
world.spawnEntityInWorld(new LaunchedPotion(world, player, potion));
World world = player.worldObj;
world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F));
if (!world.isRemote)
{
world.spawnEntityInWorld(new LaunchedPotion(world, player, potion));
}
tags.removeTag("LoadedPotion");
tags.setBoolean("Loaded", false);
}
tags.removeTag("LoadedPotion");
tags.setBoolean("Loaded", false);
return true;
}
return true;
}
return false;
}