Merge branch 'multiplayer' into 'master'

Multiplayer

Closes #157

See merge request core-developers/forge!262
This commit is contained in:
Sol
2018-03-01 03:12:26 +00:00
10 changed files with 76 additions and 10 deletions

View File

@@ -129,6 +129,12 @@ public class PlayerView extends GameEntityView {
}
final FCollectionView<PlayerView> opponents = getOpponents();
for (PlayerView opponent: opponents) {
if (opponent.getCommanders() == null) {
return Collections.emptyList();
}
}
final List<String> info = Lists.newArrayListWithExpectedSize(opponents.size());
info.add(TextUtil.concatWithSpace("Commanders:", Lang.joinHomogenous(commanders)));
for (final PlayerView p : Iterables.concat(Collections.singleton(this), opponents)) {