aboutsummaryrefslogtreecommitdiff
path: root/src/ch
diff options
context:
space:
mode:
authorPacien TRAN-GIRARD2016-03-15 22:40:17 +0100
committerPacien TRAN-GIRARD2016-03-15 22:40:17 +0100
commit1e6848b2a40b331cad4fea9e89e29df621402222 (patch)
treefa717d8c58f59a481d8aec680d55ea18f466ae90 /src/ch
parent47de23b97f65b9c97e7bce4bb2f4a496e5190bea (diff)
downloadxblast-1e6848b2a40b331cad4fea9e89e29df621402222.tar.gz
Reorder static and object members
Diffstat (limited to 'src/ch')
-rw-r--r--src/ch/epfl/xblast/server/GameState.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/ch/epfl/xblast/server/GameState.java b/src/ch/epfl/xblast/server/GameState.java
index d750732..e15f0bf 100644
--- a/src/ch/epfl/xblast/server/GameState.java
+++ b/src/ch/epfl/xblast/server/GameState.java
@@ -19,13 +19,6 @@ import java.util.stream.Stream;
19 */ 19 */
20public final class GameState { 20public final class GameState {
21 21
22 private final int ticks;
23 private final Board board;
24 private final List<Player> players;
25 private final List<Bomb> bombs;
26 private final List<Sq<Sq<Cell>>> explosions;
27 private final List<Sq<Cell>> blasts;
28
29 /** 22 /**
30 * Filters the given list of players and returns the lively ones. 23 * Filters the given list of players and returns the lively ones.
31 * 24 *
@@ -138,6 +131,13 @@ public final class GameState {
138 return null; // TODO 131 return null; // TODO
139 } 132 }
140 133
134 private final int ticks;
135 private final Board board;
136 private final List<Player> players;
137 private final List<Bomb> bombs;
138 private final List<Sq<Sq<Cell>>> explosions;
139 private final List<Sq<Cell>> blasts;
140
141 /** 141 /**
142 * Instantiates a new GameState. 142 * Instantiates a new GameState.
143 * 143 *