mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-13 05:54:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix penalties not applying on station edge

Browse Source
This commit is contained in:
Timo van Veen 2023-10-29 12:23:05 +01:00
parent 740ec9092f
commit 321056bdd0
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/simibubi/create/content/trains/entity/Navigation.java
View File

@ -1,7 +1,6 @@
package com.simibubi.create.content.trains.entity; package com.simibubi.create.content.trains.entity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.IdentityHashMap; import java.util.IdentityHashMap;
@ -693,7 +692,7 @@ public class Navigation {
double dMin = Math.abs(newNodePosition.x - destinationNodePosition.x); double dMin = Math.abs(newNodePosition.x - destinationNodePosition.x);
double dMid = Math.abs(newNodePosition.y - destinationNodePosition.y); double dMid = Math.abs(newNodePosition.y - destinationNodePosition.y);
double dMax = Math.abs(newNodePosition.z - destinationNodePosition.z); double dMax = Math.abs(newNodePosition.z - destinationNodePosition.z);
// Sort distance vector in ascending order
double temp; double temp;
if (dMin > dMid) { if (dMin > dMid) {
temp = dMid; temp = dMid;
@ -714,10 +713,10 @@ public class Navigation {
remainingDist = 0.317837245 * dMin + 0.414213562 * dMid + dMax; remainingDist = 0.317837245 * dMin + 0.414213562 * dMid + dMax;
} }
if (destination != null && Math.round(remainingDist) == 0)
remainingDist = -999999; // Ensure edges containing the station node get checked first
reachedVia.putIfAbsent(newEdge, Pair.of(validTargets.size() > 1, Couple.create(node1, node2))); reachedVia.putIfAbsent(newEdge, Pair.of(validTargets.size() > 1, Couple.create(node1, node2)));
if (destination != null && Math.round(remainingDist) == 0 && stationTest.test(newDistance, newDistance + penalty, reachedVia,
Pair.of(Couple.create(node2, newNode), newEdge), destination))
return;
frontier.add(new FrontierEntry(newDistance, penalty, remainingDist, node2, newNode, newEdge)); frontier.add(new FrontierEntry(newDistance, penalty, remainingDist, node2, newNode, newEdge));
} }
} }