From: "Enrico Weigelt, metux IT consult" <[email protected]>
---
.../sf/freecol/server/control/InGameController.java | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/net/sf/freecol/server/control/InGameController.java
b/src/net/sf/freecol/server/control/InGameController.java
index 12bf77b1524..f9b360ad11e 100644
--- a/src/net/sf/freecol/server/control/InGameController.java
+++ b/src/net/sf/freecol/server/control/InGameController.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
import java.util.Map.Entry;
import java.util.Random;
@@ -330,6 +331,17 @@ public final class InGameController extends Controller {
return messages.size();
}
+ private Set<Tile> getExploredTiles(ServerPlayer serverPlayer) {
+ Set<Tile> explore = new HashSet<>();
+ Iterator<Tile> iterator = getGame().getMap().getWholeMapIterator();
+ while (iterator.hasNext()) {
+ Tile t = iterator.next();
+ if ((!t.isLand() || t.isCoastland() || t.getOwner() ==
serverPlayer)
+ && t.isExploredBy(serverPlayer))
+ explore.add(t);
+ }
+ return explore;
+ }
// Internal utilities
@@ -349,13 +361,11 @@ public final class InGameController extends Controller {
final Monarch monarch = serverPlayer.getMonarch();
final ServerPlayer refPlayer =
getFreeColServer().makeAIPlayer(refNation);
final Europe europe = refPlayer.getEurope();
- final Predicate<Tile> exploredPred = t ->
- ((!t.isLand() || t.isCoastland() || t.getOwner() == serverPlayer)
- && t.isExploredBy(serverPlayer));
+
// Inherit rebel player knowledge of the seas, coasts, claimed
// land but not full detailed scouting knowledge.
- Set<Tile> explore = new HashSet<>();
- getGame().getMap().forEachTile(exploredPred, t -> explore.add(t));
+ Set<Tile> explore = getExploredTiles(serverPlayer);
+
refPlayer.exploreTiles(explore);
// Trigger initial placement routine
--
2.11.0.rc0.7.gbe5a750
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Freecol-developers mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freecol-developers
