diff --git a/client/render/BusRenderHelper.java b/client/render/BusRenderHelper.java index 6f41739ef..f14529a32 100644 --- a/client/render/BusRenderHelper.java +++ b/client/render/BusRenderHelper.java @@ -334,7 +334,7 @@ public class BusRenderHelper implements IPartRenderHelper if ( !renderThis() ) return; - renderer.renderStandardBlock( renderer.blockAccess.getBlock( x, y, z ), x, y, z ); + renderer.renderStandardBlock( blk, x, y, z ); } @Override diff --git a/core/Registration.java b/core/Registration.java index 9b18b0e86..ea29c773e 100644 --- a/core/Registration.java +++ b/core/Registration.java @@ -419,8 +419,7 @@ public class Registration } catch (Throwable e) { - AELog.severe( "Error with Feature: " + c.getName() ); - throw new RuntimeException( e ); + throw new RuntimeException( "Error with Feature: " + c.getName(), e ); } } diff --git a/parts/CableBusContainer.java b/parts/CableBusContainer.java index e8874bc25..dcce990b0 100644 --- a/parts/CableBusContainer.java +++ b/parts/CableBusContainer.java @@ -575,6 +575,8 @@ public class CableBusContainer implements AEMultiTile, ICableBusContainer { byte sides = data.readByte(); + boolean updateBlock = false; + for (int x = 0; x < 7; x++) { ForgeDirection side = ForgeDirection.getOrientation( x ); @@ -589,7 +591,10 @@ public class CableBusContainer implements AEMultiTile, ICableBusContainer ItemStack current = p != null ? p.getItemStack( PartItemStack.Network ) : null; if ( current != null && current.getItem() == myItem && current.getItemDamage() == dmgValue ) - p.readFromStream( data ); + { + if ( p.readFromStream( data ) ) + updateBlock = true; + } else { removePart( side, false ); @@ -607,7 +612,9 @@ public class CableBusContainer implements AEMultiTile, ICableBusContainer removePart( side, false ); } - return fc.readFromStream( data ); + if ( fc.readFromStream( data ) ) + return true; + return updateBlock; } ForgeDirection getSide(IPart part) diff --git a/parts/networking/PartCable.java b/parts/networking/PartCable.java index 18ef53a96..b1c53a9c4 100644 --- a/parts/networking/PartCable.java +++ b/parts/networking/PartCable.java @@ -284,7 +284,7 @@ public class PartCable extends AEBasePart implements IPartCable int cs = data.readByte(); int sideOut = data.readInt(); - EnumSet myC = connections; + EnumSet myC = connections.clone(); boolean wasPowered = powered; powered = false; boolean chchanged = false;