Skip to content

Commit

Permalink
Fixes Spork scouting issue.
Browse files Browse the repository at this point in the history
Issue was that two scout ships were merged and
then that fleet is no longer considered as scout fleet since it
has two ships.
  • Loading branch information
tuomount committed Jul 8, 2017
1 parent c719859 commit 67bea30
Showing 1 changed file with 5 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 67bea30

Please sign in to comment.