From fbc62d4ba246f8f0f5b25415084c3733aab2aa87 Mon Sep 17 00:00:00 2001
From: IThundxr <contact@ithundxr.dev>
Date: Thu, 30 Nov 2023 09:22:58 -0500
Subject: [PATCH] fix: signal group NPE

---
 .../java/com/simibubi/create/content/trains/graph/EdgeData.java | 2 ++
 .../com/simibubi/create/content/trains/graph/TrackGraph.java    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/simibubi/create/content/trains/graph/EdgeData.java b/src/main/java/com/simibubi/create/content/trains/graph/EdgeData.java
index 8e15284f6..221d0ece5 100644
--- a/src/main/java/com/simibubi/create/content/trains/graph/EdgeData.java
+++ b/src/main/java/com/simibubi/create/content/trains/graph/EdgeData.java
@@ -107,6 +107,8 @@ public class EdgeData {
 		if (!hasSignalBoundaries())
 			return getEffectiveEdgeGroupId(graph);
 		SignalBoundary firstSignal = next(EdgePointType.SIGNAL, 0);
+		if (firstSignal == null)
+			return null;
 		UUID currentGroup = firstSignal.getGroup(edge.node1);
 
 		for (TrackEdgePoint trackEdgePoint : getPoints()) {
diff --git a/src/main/java/com/simibubi/create/content/trains/graph/TrackGraph.java b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraph.java
index 10cace626..f72159062 100644
--- a/src/main/java/com/simibubi/create/content/trains/graph/TrackGraph.java
+++ b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraph.java
@@ -505,7 +505,7 @@ public class TrackGraph {
 
 				SignalEdgeGroup group = Create.RAILWAYS.signalEdgeGroups.get(groupId);
 				SignalEdgeGroup otherGroup = Create.RAILWAYS.signalEdgeGroups.get(otherGroupId);
-				if (group == null || otherGroup == null)
+				if (group == null || otherGroup == null || groupId == null || otherGroupId == null)
 					continue;
 
 				intersection.groupId = groupId;