mirrors
/
freecol
mirror of https://github.com/FreeCol/freecol.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Only consider transportables going to the next location on the transport list when queuing extra cargo.

This commit is contained in:
Stian Grenborgen 2023-05-05 19:06:05 +02:00
parent 1315bdb5f3
commit ccb75288d3
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/net/sf/freecol/server/ai/mission/TransportMission.java
View File

@ -1215,19 +1215,25 @@ public final class TransportMission extends Mission {
private void queueEasilyTransportedCargo(Unit carrier) {
final EuropeanAIPlayer euaip = getEuropeanAIPlayer();
final List<Cargo> ts = tCopy();
final Set<Location> existingDestinations = ts.stream()
final Location nextDestination = ts.stream()
.filter(c -> c.getCarrierTarget() != null && c.getCarrierTarget().getTile() != null)
.map(c -> c.getCarrierTarget())
.filter(Objects::nonNull)
.collect(Collectors.toSet());
.findFirst()
.orElse(null);
if (nextDestination == null) {
return;
}
for (TransportableAIObject t : euaip.getTransportables()) {
if (t.isDisposed() || !t.carriableBy(carrier)) {
continue;
}
if (t.getTransportSource() != carrier.getLocation()) {
if (!Map.isSameLocation(t.getTransportSource(), carrier.getLocation())) {
continue;
}
if (!existingDestinations.contains(t.getTransportDestination())) {
if (Map.isSameLocation(nextDestination, t.getTransportDestination())) {
continue;
}