Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-06-27 07:01:43 +02:00
Code Issues Projects Releases Wiki Activity

Fixed a couple of bugs with items that need to be held not working

Browse source
This commit is contained in:
Ellpeck 2016-05-02 07:50:13 +02:00
parent eed5cbdc92
commit bfc68919f3
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCompost.java
View file

@ -104,7 +104,7 @@ public class BlockCompost extends BlockContainerBase implements IHudDisplay{
player.inventory.setInventorySlotContents(player.inventory.currentItem, tile.slots[0].copy()); player.inventory.setInventorySlotContents(player.inventory.currentItem, tile.slots[0].copy());
} }
else{ else{
player.getActiveItemStack().stackSize += tile.slots[0].stackSize; stackPlayer.stackSize += tile.slots[0].stackSize;
} }
tile.slots[0] = null; tile.slots[0] = null;
tile.markDirty(); tile.markDirty();

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java
View file

@ -111,7 +111,7 @@ public abstract class BlockContainerBase extends BlockContainer{
} }
public boolean tryToggleRedstone(World world, BlockPos pos, EntityPlayer player){ public boolean tryToggleRedstone(World world, BlockPos pos, EntityPlayer player){
ItemStack stack = player.getActiveItemStack(); ItemStack stack = player.getHeldItemMainhand();
if(stack != null && Block.getBlockFromItem(stack.getItem()) instanceof BlockRedstoneTorch){ if(stack != null && Block.getBlockFromItem(stack.getItem()) instanceof BlockRedstoneTorch){
TileEntity tile = world.getTileEntity(pos); TileEntity tile = world.getTileEntity(pos);
if(tile instanceof IRedstoneToggle){ if(tile instanceof IRedstoneToggle){

2
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java
View file

@ -42,7 +42,7 @@ public class ItemGrowthRing extends ItemEnergy{
} }
EntityPlayer player = (EntityPlayer)entity; EntityPlayer player = (EntityPlayer)entity;
ItemStack equipped = player.getActiveItemStack(); ItemStack equipped = player.getHeldItemMainhand();
int energyUse = 300; int energyUse = 300;
if(equipped != null && equipped == stack && this.getEnergyStored(stack) >= energyUse){ if(equipped != null && equipped == stack && this.getEnergyStored(stack) >= energyUse){

2
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java
View file

@ -63,7 +63,7 @@ public class ItemPotionRing extends ItemBase implements IColorProvidingItem{
if(!world.isRemote && stack.getItemDamage() < allRings.length){ if(!world.isRemote && stack.getItemDamage() < allRings.length){
if(player instanceof EntityPlayer){ if(player instanceof EntityPlayer){
EntityPlayer thePlayer = (EntityPlayer)player; EntityPlayer thePlayer = (EntityPlayer)player;
ItemStack equippedStack = ((EntityPlayer)player).getActiveItemStack(); ItemStack equippedStack = ((EntityPlayer)player).getHeldItemMainhand();
ThePotionRings effect = ThePotionRings.values()[stack.getItemDamage()]; ThePotionRings effect = ThePotionRings.values()[stack.getItemDamage()];
Potion potion = Potion.getPotionById(effect.effectID); Potion potion = Potion.getPotionById(effect.effectID);

2
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterRemovalRing.java
View file

@ -36,7 +36,7 @@ public class ItemWaterRemovalRing extends ItemEnergy{
} }
EntityPlayer player = (EntityPlayer)entity; EntityPlayer player = (EntityPlayer)entity;
ItemStack equipped = player.getActiveItemStack(); ItemStack equipped = player.getHeldItemMainhand();
int energyUse = 350; int energyUse = 350;
if(equipped != null && equipped == stack && this.getEnergyStored(stack) >= energyUse){ if(equipped != null && equipped == stack && this.getEnergyStored(stack) >= energyUse){

2
src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java
View file

@ -354,7 +354,7 @@ public class WorldUtil{
Block block = PosUtil.getBlock(pos, world); Block block = PosUtil.getBlock(pos, world);
IBlockState state = world.getBlockState(pos); IBlockState state = world.getBlockState(pos);
TileEntity tile = world.getTileEntity(pos); TileEntity tile = world.getTileEntity(pos);
ItemStack stack = player.getActiveItemStack(); ItemStack stack = player.getHeldItemMainhand();
//If the Block can be harvested or not //If the Block can be harvested or not
boolean canHarvest = block.canHarvestBlock(world, pos, player); boolean canHarvest = block.canHarvestBlock(world, pos, player);