sending ZoneMessages in order, for consistency

Cardshifter · Aug 23, 2015 · e91fdfd · e91fdfd
1 parent 91f74ab
commit e91fdfd
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/cardshifter-core/src/main/java/com/cardshifter/core/game/TCGGame.java b/cardshifter-core/src/main/java/com/cardshifter/core/game/TCGGame.java
@@ -4,6 +4,7 @@
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -355,7 +356,10 @@ private void startECSGame() {
 			plData.setName(pl.getName());
 			this.send(new PlayerMessage(playerEntity.getId(), plData.getIndex(), plData.getName(), Resources.map(playerEntity)));
 		});
-		this.game.findEntities(e -> true).stream().flatMap(e -> e.getSuperComponents(ZoneComponent.class).stream()).forEach(this::sendZone);
+        this.game.findEntities(e -> true).stream()
+                .flatMap(e -> e.getSuperComponents(ZoneComponent.class).stream())
+                .sorted(Comparator.comparingInt(ZoneComponent::getZoneId))
+                .forEach(this::sendZone);
 		this.sendAvailableActions();
 	}