From 0d8eb92a105d7f609afd720caab1e65a5404644a Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Thu, 28 Aug 2014 20:28:26 +0800 Subject: [PATCH] Fixed spamming of block updates when a conduits neighbor changes. --- .../enderio/conduit/AbstractConduit.java | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/AbstractConduit.java b/src/main/java/crazypants/enderio/conduit/AbstractConduit.java index d6d14f39..19934228 100644 --- a/src/main/java/crazypants/enderio/conduit/AbstractConduit.java +++ b/src/main/java/crazypants/enderio/conduit/AbstractConduit.java @@ -445,9 +445,7 @@ public abstract class AbstractConduit implements IConduit { @Override public boolean onNeighborBlockChange(Block block) { - // Check for changes to external connections, connections to conduits are - // handled by the bundle - + // NB: No need to check externals if the neighbour that changed was a // conduit bundle as this // can't effect external connections. @@ -455,9 +453,29 @@ public abstract class AbstractConduit implements IConduit { return false; } - connectionsDirty = true; - - return true; + // Check for changes to external connections, connections to conduits are + // handled by the bundle + Set newCons = new HashSet(); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if(!containsConduitConnection(dir) && canConnectToExternal(dir, false)) { + newCons.add(dir); + } + } + if(newCons.size() != externalConnections.size()) { + connectionsDirty = true; + return true; + } + for(ForgeDirection dir : externalConnections) { + if(!newCons.remove(dir)) { + connectionsDirty = true; + return true; + } + } + if(!newCons.isEmpty()) { + connectionsDirty = true; + return true; + } + return false; } @Override