Skip to content

Commit bb7e835

Browse files
authored
Merge pull request #5826 from IThundxr/mc1.18/fixSignalNPE
fix: Signal Group NPE
2 parents cbaab91 + ff4eb58 commit bb7e835

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/main/java/com/simibubi/create/content/trains/graph/EdgeData.java

+2
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ public UUID getGroupAtPosition(TrackGraph graph, double position) {
107107
if (!hasSignalBoundaries())
108108
return getEffectiveEdgeGroupId(graph);
109109
SignalBoundary firstSignal = next(EdgePointType.SIGNAL, 0);
110+
if (firstSignal == null)
111+
return null;
110112
UUID currentGroup = firstSignal.getGroup(edge.node1);
111113

112114
for (TrackEdgePoint trackEdgePoint : getPoints()) {

src/main/java/com/simibubi/create/content/trains/graph/TrackGraph.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ public void resolveIntersectingEdgeGroups(Level level) {
505505

506506
SignalEdgeGroup group = Create.RAILWAYS.signalEdgeGroups.get(groupId);
507507
SignalEdgeGroup otherGroup = Create.RAILWAYS.signalEdgeGroups.get(otherGroupId);
508-
if (group == null || otherGroup == null)
508+
if (group == null || otherGroup == null || groupId == null || otherGroupId == null)
509509
continue;
510510

511511
intersection.groupId = groupId;

0 commit comments

Comments
 (0)