From 67bea30f8a28a614f08f830de26582ea927ac6a5 Mon Sep 17 00:00:00 2001 From: Tuomo Untinen Date: Sat, 8 Jul 2017 16:35:26 +0300 Subject: [PATCH] Fixes Spork scouting issue. Issue was that two scout ships were merged and then that fleet is no longer considered as scout fleet since it has two ships. --- .../org/openRealmOfStars/AI/Mission/MissionHandling.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/org/openRealmOfStars/AI/Mission/MissionHandling.java b/src/main/java/org/openRealmOfStars/AI/Mission/MissionHandling.java index 5e64e8c7c..8bc14178a 100644 --- a/src/main/java/org/openRealmOfStars/AI/Mission/MissionHandling.java +++ b/src/main/java/org/openRealmOfStars/AI/Mission/MissionHandling.java @@ -323,6 +323,11 @@ public static void handleDefend(final Mission mission, final Fleet fleet, public static void mergeFleets(final Fleet fleet, final PlayerInfo info) { // Merging fleets String[] part = fleet.getName().split("#"); + if (part[0].contains("Scout") + || part[0].contains("Explorer")) { + // Do not merge scout fleets. + return; + } for (int j = 0; j < info.getFleets().getNumberOfFleets(); j++) { // Merge fleets in same space with same starting of fleet name Fleet mergeFleet = info.getFleets().getByIndex(j);