From c7ccab75b878a47aba7cd7df7d1ae99138dc049c Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 21 Jan 2016 19:59:26 +0100 Subject: [PATCH] Cheap workaround for glitching into some blocks with a smaller hitbox causing graphical glitches and damaging the player --- .../actuallyadditions/mod/blocks/BlockCoffeeMachine.java | 5 +++++ .../actuallyadditions/mod/blocks/BlockFishingNet.java | 5 +++++ .../actuallyadditions/mod/blocks/BlockFurnaceSolar.java | 5 +++++ .../actuallyadditions/mod/blocks/BlockLaserRelay.java | 5 +++++ .../actuallyadditions/mod/blocks/BlockPhantomBooster.java | 5 +++++ .../actuallyadditions/mod/blocks/BlockSmileyCloud.java | 5 +++++ 6 files changed, 30 insertions(+) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java index 0bd4b2af7..e8a87f70f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java @@ -54,6 +54,11 @@ public class BlockCoffeeMachine extends BlockContainerBase{ return false; } + @Override + public boolean isFullCube(){ + return false; + } + @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing f6, float f7, float f8, float f9){ if(!world.isRemote){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java index e4aa6604f..174fa7841 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFishingNet.java @@ -39,6 +39,11 @@ public class BlockFishingNet extends BlockContainerBase{ return false; } + @Override + public boolean isFullCube(){ + return false; + } + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.RARE; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java index a6831a0d3..09a6fe024 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceSolar.java @@ -39,6 +39,11 @@ public class BlockFurnaceSolar extends BlockContainerBase{ return false; } + @Override + public boolean isFullCube(){ + return false; + } + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.UNCOMMON; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java index 4b3dedbbb..17d9493be 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java @@ -57,6 +57,11 @@ public class BlockLaserRelay extends BlockContainerBase{ return false; } + @Override + public boolean isFullCube(){ + return false; + } + @Override public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, int meta, EntityLivingBase base){ return this.getStateFromMeta(side.ordinal()); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java index f2f70a3df..864dda1b0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java @@ -36,6 +36,11 @@ public class BlockPhantomBooster extends BlockContainerBase{ return false; } + @Override + public boolean isFullCube(){ + return false; + } + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.EPIC; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java index 3c5f2d85f..2093b07d3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java @@ -57,6 +57,11 @@ public class BlockSmileyCloud extends BlockContainerBase{ return false; } + @Override + public boolean isFullCube(){ + return false; + } + @Override @SideOnly(Side.CLIENT) public void randomDisplayTick(World world, BlockPos pos, IBlockState state, Random rand){