lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix NPE in mimic when loading some tiles (#951)

Browse source
This commit is contained in:
Nicholas Ignoffo 2016-10-18 16:12:39 -07:00
parent 37fad3f349
commit d7b0abafd9
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/WayofTime/bloodmagic/tile/TileMimic.java
View file

@ -4,7 +4,6 @@ import java.lang.reflect.Field;
import java.util.List; import java.util.List;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityPotion; import net.minecraft.entity.projectile.EntityPotion;
@ -347,9 +346,13 @@ public class TileMimic extends TileInventory implements ITickable
if (stack != null && stack.getItem() instanceof ItemBlock) if (stack != null && stack.getItem() instanceof ItemBlock)
{ {
Block block = ((ItemBlock) stack.getItem()).getBlock(); Block block = ((ItemBlock) stack.getItem()).getBlock();
if (block instanceof ITileEntityProvider) IBlockState state = block.getStateFromMeta(stack.getItemDamage());
if (block.hasTileEntity(state))
{ {
TileEntity tile = ((ITileEntityProvider) block).createNewTileEntity(world, stack.getItemDamage()); TileEntity tile = block.createTileEntity(world, state);
if (tile == null)
return null;
if (tag != null) if (tag != null)
{ {