From: "Enrico Weigelt, metux IT consult" <enrico.weig...@gr13.net>
---
src/net/sf/freecol/server/model/ServerPlayer.java | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/net/sf/freecol/server/model/ServerPlayer.java
b/src/net/sf/freecol/server/model/ServerPlayer.java
index 0eb01fca07d..ae3703aa2a2 100644
--- a/src/net/sf/freecol/server/model/ServerPlayer.java
+++ b/src/net/sf/freecol/server/model/ServerPlayer.java
@@ -25,6 +25,7 @@ import java.util.Collections;
import java.util.EnumMap;
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;
@@ -655,8 +656,14 @@ public class ServerPlayer extends Player implements
ServerModelObject {
}
// Clean up remaining tile ownerships
- for (Tile t : transform(getGame().getMap().getAllTiles(),
- matchKeyEquals(this, Tile::getOwner))) {
+ Iterator<Tile> iterator = getGame().getMap().getWholeMapIterator();
+ while (iterator.hasNext()) {
+ Tile t = iterator.next();
+
+ // skip out tiles that dont belong to the currently killed player
+ if ((t == null) || !equals(t.getOwner()))
+ continue;
+
t.cacheUnseen();//+til
t.changeOwnership(null, null);//-til
cs.add(See.perhaps().always(this), t);
@@ -947,8 +954,10 @@ public class ServerPlayer extends Player implements
ServerModelObject {
*/
public Set<Tile> exploreMap(boolean reveal) {
Set<Tile> result = new HashSet<>();
- for (Tile t : transform(getGame().getMap().getAllTiles(),
- t -> hasExplored(t) != reveal)) {
+ Iterator<Tile> iterator = getGame().getMap().getWholeMapIterator();
+ while (iterator.hasNext()) {
+ Tile t = iterator.next();
+ if (hasExplored(t) == reveal) continue;
t.setExplored(this, reveal);//-vis(this)
result.add(t);
}
--
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
Freecol-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/freecol-developers
