tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Fixed a small crash

Browse source
This commit is contained in:
aidancbrady 2015-11-25 08:48:05 -07:00
parent ef6d62294d
commit 40f7373819
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/mekanism/common/item/ItemBlockBasic.java
View file

@ -1,8 +1,7 @@
package mekanism.common.item; package mekanism.common.item;
import java.util.ArrayList; import cpw.mods.fml.relauncher.Side;
import java.util.List; import cpw.mods.fml.relauncher.SideOnly;
import mekanism.api.Coord4D; import mekanism.api.Coord4D;
import mekanism.api.EnumColor; import mekanism.api.EnumColor;
import mekanism.api.Range4D; import mekanism.api.Range4D;
@ -29,8 +28,9 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.World; import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList;
import java.util.List;
/** /**
* Item class for handling multiple metal block IDs. * Item class for handling multiple metal block IDs.
@ -199,7 +199,6 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem
{ {
return null; return null;
} }
}
ItemStack ret = stack.copy(); ItemStack ret = stack.copy();
ret.stackTagCompound.setInteger("itemCount", stack.stackTagCompound.getInteger("newCount")); ret.stackTagCompound.setInteger("itemCount", stack.stackTagCompound.getInteger("newCount"));
@ -207,6 +206,9 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem
return ret; return ret;
} }
return null;
}
@Override @Override
public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata)
{ {