From 74f4e4f224c77ac9e5d0c042a3c04cc06cc198db Mon Sep 17 00:00:00 2001 From: Arcaratus Date: Thu, 16 Jul 2015 09:46:30 -0400 Subject: [PATCH] Refixed the Dismantler --- .../common/items/ItemRitualDismantler.java | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java index 062d5eb1..d1ca42ce 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java @@ -9,6 +9,7 @@ import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -49,14 +50,12 @@ public class ItemRitualDismantler extends EnergyItems public boolean breakRitualStoneAtMasterStone(ItemStack stack, EntityPlayer player, World world, int x, int y, int z) { - ItemStack[] playerInventory = player.inventory.mainInventory; TileEntity tileEntity = world.getTileEntity(x, y, z); if (tileEntity instanceof TEMasterStone) { TEMasterStone masterStone = (TEMasterStone) tileEntity; int direction = masterStone.getDirection(); - int freeSpace = -1; String ritualName = Rituals.checkValidRitual(world, x, y, z); List ritualList = Rituals.getRitualList(ritualName); @@ -65,29 +64,21 @@ public class ItemRitualDismantler extends EnergyItems return false; } - for (int i = 0; i < playerInventory.length; i++) - { - if (playerInventory[i] == null) - { - freeSpace = i; - break; - } - } - for (RitualComponent rc : ritualList) { if (!world.isAirBlock(x + rc.getX(direction), y + rc.getY(), z + rc.getZ(direction)) && world.getBlock(x + rc.getX(direction), y + rc.getY(), z + rc.getZ(direction)) instanceof RitualStone) { - if (freeSpace >= 0) + if (EnergyItems.syphonBatteries(stack, player, getEnergyUsed()) || player.capabilities.isCreativeMode) { - if (EnergyItems.syphonBatteries(stack, player, getEnergyUsed()) || player.capabilities.isCreativeMode) + world.setBlockToAir(x + rc.getX(direction), y + rc.getY(), z + rc.getZ(direction)); + EntityItem entityItem = new EntityItem(world, player.posX, player.posY, player.posZ, new ItemStack(ModBlocks.ritualStone)); + if (world.isRemote) { - world.setBlockToAir(x + rc.getX(direction), y + rc.getY(), z + rc.getZ(direction)); - player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.ritualStone)); - if (world.isRemote) - { - world.playAuxSFX(2005, x, y + 1, z, 0); - } + world.playAuxSFX(2005, x, y + 1, z, 0); + } + else + { + world.spawnEntityInWorld(entityItem); } } }