Ld pipe crash fix (#2028)

GregTechCEu · Aug 7, 2023 · 09bfcad · 09bfcad
1 parent 8773e34
commit 09bfcad
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/main/java/gregtech/api/pipenet/longdist/LongDistanceNetwork.java b/src/main/java/gregtech/api/pipenet/longdist/LongDistanceNetwork.java
@@ -1,7 +1,6 @@
 package gregtech.api.pipenet.longdist;
 
 import gregtech.api.pipenet.WorldPipeNet;
-import gregtech.api.util.GTLog;
 import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
@@ -69,6 +68,7 @@ protected void recalculateNetwork(Collection<BlockPos> starts) {
      * Called from the {@link NetworkBuilder} to set the gathered data
      */
     protected void setData(Collection<BlockPos> pipes, List<ILDEndpoint> endpoints) {
+        invalidateEndpoints();
         boolean wasEmpty = this.longDistancePipeBlocks.isEmpty();
         this.longDistancePipeBlocks.clear();
         this.longDistancePipeBlocks.addAll(pipes);
@@ -202,7 +202,9 @@ public ILDEndpoint getOtherEndpoint(ILDEndpoint endpoint) {
         // return null for invalid network configurations
         if (!isValid() || (!endpoint.isInput() && !endpoint.isOutput())) return null;
 
-        if (this.activeInputIndex >= 0 && this.activeOutputIndex >= 0) {
+        if (isIOIndexInvalid()) {
+            invalidateEndpoints();
+        } else if (this.activeInputIndex >= 0) {
             // there is an active input and output endpoint
             ILDEndpoint in = this.endpoints.get(this.activeInputIndex);
             ILDEndpoint out = this.endpoints.get(this.activeOutputIndex);
@@ -221,10 +223,6 @@ public ILDEndpoint getOtherEndpoint(ILDEndpoint endpoint) {
                 return in;
             }
             return null;
-        } else if (this.activeInputIndex < 0 != this.activeOutputIndex < 0) {
-            // only input or output is active
-            GTLog.logger.warn("Long Distance Network has an {}. This should not happen!", this.activeInputIndex < 0 ? "active input, but not an active output" : "active output, but not an active input");
-            invalidateEndpoints(); // shouldn't happen
         }
 
         // find a valid endpoint in this net
@@ -257,6 +255,12 @@ private int find(ILDEndpoint endpoint) {
         return -1;
     }
 
+    public boolean isIOIndexInvalid() {
+        return (this.activeInputIndex >= 0 && this.activeInputIndex >= this.endpoints.size())
+                || (this.activeOutputIndex >= 0 && this.activeOutputIndex >= this.endpoints.size())
+                || this.activeInputIndex < 0 != this.activeOutputIndex < 0;
+    }
+
     public ILDEndpoint getActiveInputIndex() {
         return this.activeInputIndex >= 0 ? this.endpoints.get(this.activeInputIndex) : null;
     }