X-Git-Url: http://git.sourceforge.jp/view?p=chemicraft%2Fchemicraft.git;a=blobdiff_plain;f=common%2Fpcc%2Fchemicraft%2Fcore%2Fitem%2FItemAtoms.java;h=b3ee9a390f962ec2311cc7d14161fca9e11f2a9d;hp=48e47147397b8ebbc70f9edc3144257cb468003a;hb=1025f933e5e1843e585668ef6aa07ac9e1a58980;hpb=e9d768cf7b31f4af3f845feda5c8969faa0db9db diff --git a/common/pcc/chemicraft/core/item/ItemAtoms.java b/common/pcc/chemicraft/core/item/ItemAtoms.java index 48e4714..b3ee9a3 100644 --- a/common/pcc/chemicraft/core/item/ItemAtoms.java +++ b/common/pcc/chemicraft/core/item/ItemAtoms.java @@ -6,12 +6,15 @@ import java.util.Random; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; import net.minecraft.util.EntityDamageSource; import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; import pcc.chemicraft.ChemiCraft; import pcc.chemicraft.core.ChemiCraftCore; import pcc.chemicraft.util.AtomInfo; @@ -40,7 +43,16 @@ public class ItemAtoms extends Item { EntityLiving entity = (EntityLiving)par3Entity; entity.attackEntityFrom(ChemiCraftCore.getRadiationDamageSource(entity), 1); } - par1ItemStack.setItemDamage(AtomInfo.collapseUraniumSeries(par1ItemStack.getItemDamage() + 1) - 1); + if (par3Entity instanceof EntityPlayer){ + EntityPlayer player = (EntityPlayer)par3Entity; + ItemStack itemstack = new ItemStack( + par1ItemStack.itemID, + 1, + par1ItemStack.getItemDamage()); + itemstack.setItemDamage(AtomInfo.collapseUraniumSeries(itemstack.getItemDamage() + 1) - 1); + player.inventory.addItemStackToInventory(itemstack); + player.inventory.consumeInventoryItem(par1ItemStack.itemID); + } } } }