diff --git a/src/main/java/crazypants/enderio/conduit/me/MEConduit.java b/src/main/java/crazypants/enderio/conduit/me/MEConduit.java index a7fb8c2c..e7a897ca 100644 --- a/src/main/java/crazypants/enderio/conduit/me/MEConduit.java +++ b/src/main/java/crazypants/enderio/conduit/me/MEConduit.java @@ -157,8 +157,6 @@ public class MEConduit extends AbstractConduit implements IMEConduit { grid = new MEConduitGrid(this); } - System.out.println(validConnections); - if(getNode() == null && !worldObj.isRemote) { IGridNode node = AEApi.instance().createGridNode(grid); if(node != null) { diff --git a/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java b/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java index e2bb6199..5c7e78b2 100644 --- a/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java +++ b/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java @@ -164,6 +164,11 @@ public class TileElectricLight extends TileEntityEio implements IInternalPowerRe int minDist = Integer.MAX_VALUE; BlockCoord charger = null; Map map = WirelessChargerController.instance.getChargerMap(worldObj); + + if (map == null) { + return null; + } + for (BlockCoord b : map.keySet()) { int dist = b.distance(new BlockCoord(this)); if (dist < minDist) {