From 4a5cea34b192dc7ae6292dfd6d5cfd251cab9fe4 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 11 Mar 2014 17:36:23 +0000 Subject: [PATCH] Mana Detectors don't register collision boxes for IManaBurst instances. --- .../botania/common/block/BlockManaDetector.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/MODSRC/vazkii/botania/common/block/BlockManaDetector.java b/MODSRC/vazkii/botania/common/block/BlockManaDetector.java index 51b5d9cef..f724b74a6 100644 --- a/MODSRC/vazkii/botania/common/block/BlockManaDetector.java +++ b/MODSRC/vazkii/botania/common/block/BlockManaDetector.java @@ -11,15 +11,20 @@ */ package vazkii.botania.common.block; +import java.util.List; + import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.ILexiconable; +import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileManaDetector; @@ -60,6 +65,12 @@ public class BlockManaDetector extends BlockModContainer implements ILexiconable public int isProvidingWeakPower(IBlockAccess par1iBlockAccess, int par2, int par3, int par4, int par5) { return par1iBlockAccess.getBlockMetadata(par2, par3, par4) != 0 ? 15 : 0; } + + @Override + public void addCollisionBoxesToList(World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { + if(par7Entity != null && !(par7Entity instanceof IManaBurst)) + super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); + } @Override public TileEntity createNewTileEntity(World world) {