fix: issues with InterSignalBox

MrTroble · Aug 13, 2024 · 0affb94 · 0affb94
1 parent 68ebbeb
commit 0affb94
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/main/java/com/troblecodings/signals/enums/PathwayRequestResult.java b/src/main/java/com/troblecodings/signals/enums/PathwayRequestResult.java
@@ -34,8 +34,7 @@ public PathwayData getPathwayData() {
     }
 
     public boolean canBeAddedToSaver() {
-        return this == ALREADY_USED || this == NO_PATH
-                || !(data != null && !data.isInterSignalBoxPathway());
+        return this == ALREADY_USED || this == NO_PATH;
     }
 
     public boolean isPass() {

diff --git a/src/main/java/com/troblecodings/signals/signalbox/SignalBoxGrid.java b/src/main/java/com/troblecodings/signals/signalbox/SignalBoxGrid.java
@@ -311,6 +311,10 @@ public List<Map.Entry<Point, Point>> getNextPathways() {
     public boolean addNextPathway(final Point start, final Point end) {
         final Map.Entry<Point, Point> entry = Maps.immutableEntry(start, end);
         if (!nextPathways.contains(entry)) {
+            final SignalBoxPathway pw = startsToPath.get(start);
+            if (pw != null && pw.isInterSignalBoxPathway()) {
+                return false;
+            }
             if (executingForEach) {
                 toAdd.add(entry);
             } else {

diff --git a/src/main/java/com/troblecodings/signals/signalbox/SignalBoxPathway.java b/src/main/java/com/troblecodings/signals/signalbox/SignalBoxPathway.java
@@ -664,4 +664,8 @@ public boolean isShuntingPath() {
     public PathType getPathType() {
         return data.getPathType();
     }
+
+    public boolean isInterSignalBoxPathway() {
+        return this instanceof InterSignalBoxPathway;
+    }
 }