From 1025f933e5e1843e585668ef6aa07ac9e1a58980 Mon Sep 17 00:00:00 2001 From: ponkotate Date: Sun, 31 Mar 2013 15:01:26 +0900 Subject: [PATCH 1/1] =?utf8?q?=E4=BF=AE=E6=AD=A3=E3=83=BB=E5=A4=89?= =?utf8?q?=E6=9B=B4=20=E3=83=BB=E6=94=BE=E5=B0=84=E6=80=A7=E5=90=8C?= =?utf8?q?=E4=BD=8D=E4=BD=93=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- common/pcc/chemicraft/core/item/ItemAtoms.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) 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); + } } } } -- 2.11.0