Merge pull request #209 from MrTroble/fix/1.16.5

fix: NPEs in SignalBoxPathway
MrTroble · Aug 5, 2023 · 824eb51 · 824eb51
2 parents dffa0de + 8808953
commit 824eb51
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -30,7 +30,7 @@ jobs:
     if: endswith(github.ref_name, 'master') && github.ref_protected && github.ref_type == 'branch'
     runs-on: ubuntu-latest
     env:
-      APPVEYOR_BUILD_VERSION: '3.0.0'
+      APPVEYOR_BUILD_VERSION: '3.0.1'
       CURSETOKEN: ${{ secrets.CURSETOKEN }}
     steps:
     - uses: actions/checkout@v3

diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.16.5 - 3.0.1]
+
+fix: ServerStartup issue
+
 ## [1.16.5 - 3.0.0]
 
 * feat: added multilinking tool

diff --git a/src/main/java/com/troblecodings/signals/signalbox/SignalBoxPathway.java b/src/main/java/com/troblecodings/signals/signalbox/SignalBoxPathway.java
@@ -79,8 +79,8 @@ public SignalBoxPathway(final Map<Point, SignalBoxNode> modeGrid,
         if (this.type.equals(PathType.NONE))
             throw new IllegalArgumentException();
         initalize();
-        updatePathwayToAutomatic();
         this.originalFirstPoint = new Point(firstPoint);
+        updatePathwayToAutomatic();
     }
 
     private void initalize() {
@@ -360,7 +360,11 @@ public void deactivateAllOutputsOnPathway() {
     }
 
     public void updatePathwayToAutomatic() {
-        final SignalBoxNode first = modeGrid.get(firstPoint);
+        final SignalBoxNode first = modeGrid.get(originalFirstPoint);
+        if (first == null) {
+            isAutoPathway = false;
+            return;
+        }
         this.isAutoPathway = first.isAutoPoint();
     }
 
@@ -424,4 +428,4 @@ public ImmutableList<SignalBoxNode> getListOfNodes() {
     public boolean isEmptyOrBroken() {
         return emptyOrBroken;
     }
-}
+}