X-Git-Url: http://git.sourceforge.jp/view?p=chemicraft%2Fchemicraft.git;a=blobdiff_plain;f=common%2Fchemicraft%2Fitem%2FItemAtomGrenade.java;h=4ea937d58e395420df612b9b87a8adf6dad309b7;hp=cc94898ea200856613f3975fd8ee26f290cfe77c;hb=538a4a5ff6115b19256342ccc995dc99f4f77e39;hpb=133482f2b8d8fa632abff970a29279eba9ae25f0

diff --git a/common/chemicraft/item/ItemAtomGrenade.java b/common/chemicraft/item/ItemAtomGrenade.java
index cc94898..4ea937d 100644
--- a/common/chemicraft/item/ItemAtomGrenade.java
+++ b/common/chemicraft/item/ItemAtomGrenade.java
@@ -25,22 +25,23 @@ public class ItemAtomGrenade extends Item {
 		boolean var2 = false;
 		boolean var3 = false;
 
-		NBTTagList var4 = par1ItemStack.getTagCompound().getTagList("Effect");
+		if(par1ItemStack.stackTagCompound != null){
+			NBTTagList var4 = par1ItemStack.getTagCompound().getTagList("Effect");
 
-		for(int i = 0;i < 3;i++){
-			if(!((NBTTagCompound)var4.tagAt(0)).getString("GrenadeEffect" + i).equals("")){
-				if(((NBTTagCompound)var4.tagAt(0)).getString("GrenadeEffect" + i).equals("Hydrogen")){
-					var1 = true;
-				}
-				if(((NBTTagCompound)var4.tagAt(0)).getString("GrenadeEffect" + i).equals("Carbon")){
-					var2 = true;
-				}
-				if(((NBTTagCompound)var4.tagAt(0)).getString("GrenadeEffect" + i).equals("Uranium")){
-					var3 = true;
+			for(int i = 0;i < 3;i++){
+				if(!((NBTTagCompound)var4.tagAt(0)).getString("GrenadeEffect" + i).equals("")){
+					if(((NBTTagCompound)var4.tagAt(0)).getString("GrenadeEffect" + i).equals("Hydrogen")){
+						var1 = true;
+					}
+					if(((NBTTagCompound)var4.tagAt(0)).getString("GrenadeEffect" + i).equals("Carbon")){
+						var2 = true;
+					}
+					if(((NBTTagCompound)var4.tagAt(0)).getString("GrenadeEffect" + i).equals("Uranium")){
+						var3 = true;
+					}
 				}
 			}
 		}
-
 		EntityAtomGrenade entity = new EntityAtomGrenade(par2World, par3EntityPlayer, var1, var2, var3);
 		par2World.spawnEntityInWorld(entity);
 		par1ItemStack.stackSize--;