This commit is contained in:
Timo van Veen 2023-10-30 18:38:29 +01:00
parent 2565fa7605
commit aff05bf84a
4 changed files with 12 additions and 13 deletions

View file

@ -1,7 +1,6 @@
package com.simibubi.create.content.trains.entity;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
@ -55,8 +54,6 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.network.PacketDistributor;
import org.openjdk.nashorn.internal.objects.Global;
public class CarriageContraptionEntity extends OrientedContraptionEntity {
private static final EntityDataAccessor<CarriageSyncData> CARRIAGE_DATA =

View file

@ -611,6 +611,7 @@ public class Navigation {
int signalWeight = Mth.clamp(ticksWaitingForSignal * 2, Train.Penalties.RED_SIGNAL, 200);
// Apply penalties to initial edge
int initialPenalty = 0;
if (costRelevant)
initialPenalty += penalties.getOrDefault(initialEdge, 0);
@ -712,6 +713,7 @@ public class Navigation {
if (costRelevant)
newPenalty += penalties.getOrDefault(newEdge, 0);
// Apply penalty to next connected edge
boolean hasDestination = false;
EdgeData signalData = newEdge.getEdgeData();
if (signalData.hasPoints()) {
@ -758,7 +760,7 @@ public class Navigation {
continue;
double remainingDist = 0;
// Calculate remaining distance estimator for next connected edge
if (destinations != null && !destinations.isEmpty()) {
remainingDist = Double.MAX_VALUE;
Vec3 newNodePosition = newNode.getLocation().getLocation();