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

Inventories now don't NPE when broken

Browse source
This commit is contained in:
Nick 2015-11-03 09:11:39 -08:00
parent 6a5f5356ce
commit ddcc1237e8
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java
View file

@ -44,7 +44,7 @@ public class BloodAltar {
} }
} }
return true; return false;
} }
public static AltarUpgrade getUpgrades(World world, BlockPos pos, EnumAltarTier altarTier) public static AltarUpgrade getUpgrades(World world, BlockPos pos, EnumAltarTier altarTier)

10
src/main/java/WayofTime/bloodmagic/block/BlockAltar.java
View file

@ -3,7 +3,6 @@ package WayofTime.bloodmagic.block;
import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.iface.IAltarReader; import WayofTime.bloodmagic.api.iface.IAltarReader;
import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.tile.TileAltar;
import WayofTime.bloodmagic.tile.TileInventory;
import net.minecraft.block.BlockContainer; import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
@ -88,10 +87,11 @@ public class BlockAltar extends BlockContainer {
} }
@Override @Override
public void breakBlock(World world, BlockPos blockPos, IBlockState blockState) public void breakBlock(World world, BlockPos blockPos, IBlockState blockState) {
{ TileAltar tileAltar = (TileAltar) world.getTileEntity(blockPos);
TileInventory tileInventory = (TileInventory) world.getTileEntity(blockPos); if (tileAltar != null)
if (tileInventory != null) tileInventory.dropItems(); tileAltar.dropItems();
super.breakBlock(world, blockPos, blockState); super.breakBlock(world, blockPos, blockState);
} }

6
src/main/java/WayofTime/bloodmagic/tile/TileInventory.java
View file

@ -3,6 +3,7 @@ package WayofTime.bloodmagic.tile;
import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.InventoryHelper;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagList;
@ -57,10 +58,7 @@ public class TileInventory extends TileEntity implements IInventory {
} }
public void dropItems() { public void dropItems() {
if (inventory != null) { InventoryHelper.dropInventoryItems(getWorld(), getPos(), this);
for (ItemStack stack : inventory)
getWorld().spawnEntityInWorld(new EntityItem(getWorld(), getPos().getX(), pos.getY(), pos.getZ(), stack));
}
} }
// IInventory // IInventory