From 558f382543549f0af98ec6db20f4b024e39ca09d Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 1 Mar 2015 09:34:38 -0500 Subject: [PATCH] Fix WAILA issues with conduits inside facades (#2013) --- src/main/java/crazypants/enderio/waila/WailaCompat.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index bd6d5971..295422e2 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -28,6 +28,7 @@ import crazypants.enderio.BlockEio; import crazypants.enderio.EnderIO; import crazypants.enderio.TileEntityEio; import crazypants.enderio.block.BlockDarkSteelAnvil; +import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.conduit.liquid.AbstractTankConduit; import crazypants.enderio.conduit.me.IMEConduit; @@ -42,7 +43,6 @@ import crazypants.enderio.machine.capbank.TileCapBank; import crazypants.enderio.power.IInternalPoweredTile; import crazypants.util.IFacade; import crazypants.util.Lang; - import static crazypants.enderio.waila.IWailaInfoProvider.*; public class WailaCompat implements IWailaDataProvider { @@ -133,6 +133,10 @@ public class WailaCompat implements IWailaDataProvider { MovingObjectPosition pos = accessor.getPosition(); if(config.getConfig("facades.hidden")) { if(accessor.getBlock() instanceof IFacade) { + // If facades are hidden, we need to ignore it + if(accessor.getTileEntity() instanceof IConduitBundle && ConduitUtil.isFacadeHidden((IConduitBundle) accessor.getTileEntity(), accessor.getPlayer())) { + return null; + } IFacade bundle = (IFacade) accessor.getBlock(); Block facade = bundle.getFacade(accessor.getWorld(), pos.blockX, pos.blockY, pos.blockZ, accessor.getSide().ordinal()); if(facade != null) {