aboutsummaryrefslogtreecommitdiff
path: root/src/ch/epfl
diff options
context:
space:
mode:
Diffstat (limited to 'src/ch/epfl')
-rw-r--r--src/ch/epfl/xblast/server/Board.java4
-rw-r--r--src/ch/epfl/xblast/server/Ticks.java12
2 files changed, 8 insertions, 8 deletions
diff --git a/src/ch/epfl/xblast/server/Board.java b/src/ch/epfl/xblast/server/Board.java
index 62cfd0a..5e899f6 100644
--- a/src/ch/epfl/xblast/server/Board.java
+++ b/src/ch/epfl/xblast/server/Board.java
@@ -111,14 +111,14 @@ public final class Board {
111 111
112 List<List<Block>> rowsList = new ArrayList<>(); 112 List<List<Block>> rowsList = new ArrayList<>();
113 113
114 List<List<Block>> halfInnerBoard = Lists.<List<Block>>mirrored(quadrantNWBlocks); 114 List<List<Block>> halfInnerBoard = Lists.mirrored(quadrantNWBlocks);
115 115
116 for (int i = 0; i < halfInnerBoard.size(); i++) { 116 for (int i = 0; i < halfInnerBoard.size(); i++) {
117 if (halfInnerBoard.get(i).size() != 7) { 117 if (halfInnerBoard.get(i).size() != 7) {
118 throw new IllegalArgumentException(); 118 throw new IllegalArgumentException();
119 } 119 }
120 120
121 rowsList.add(Lists.<Block>mirrored(halfInnerBoard.get(i))); 121 rowsList.add(Lists.mirrored(halfInnerBoard.get(i)));
122 } 122 }
123 return ofInnerBlocksWalled(rowsList); 123 return ofInnerBlocksWalled(rowsList);
124 } 124 }
diff --git a/src/ch/epfl/xblast/server/Ticks.java b/src/ch/epfl/xblast/server/Ticks.java
index c19f073..aa08a23 100644
--- a/src/ch/epfl/xblast/server/Ticks.java
+++ b/src/ch/epfl/xblast/server/Ticks.java
@@ -11,31 +11,31 @@ public interface Ticks {
11 /** 11 /**
12 * Duration of the death of a player (in ticks). 12 * Duration of the death of a player (in ticks).
13 */ 13 */
14 public static int PLAYER_DYING_TICKS = 8; 14 int PLAYER_DYING_TICKS = 8;
15 15
16 /** 16 /**
17 * Duration of the invulnerability of a player (in ticks). 17 * Duration of the invulnerability of a player (in ticks).
18 */ 18 */
19 public static int PLAYER_INVULNERABLE_TICKS = 64; 19 int PLAYER_INVULNERABLE_TICKS = 64;
20 20
21 /** 21 /**
22 * Duration of the timer of a bomb (in ticks). 22 * Duration of the timer of a bomb (in ticks).
23 */ 23 */
24 public static int BOMB_FUSE_TICKS = 100; 24 int BOMB_FUSE_TICKS = 100;
25 25
26 /** 26 /**
27 * Duration of an explosion (in ticks). 27 * Duration of an explosion (in ticks).
28 */ 28 */
29 public static int EXPLOSION_TICKS = 30; 29 int EXPLOSION_TICKS = 30;
30 30
31 /** 31 /**
32 * Duration of crumbling of a wall (in ticks). 32 * Duration of crumbling of a wall (in ticks).
33 */ 33 */
34 public static int WALL_CRUMBLING_TICKS = EXPLOSION_TICKS; 34 int WALL_CRUMBLING_TICKS = EXPLOSION_TICKS;
35 35
36 /** 36 /**
37 * Duration of the presence of a bonus (in ticks). 37 * Duration of the presence of a bonus (in ticks).
38 */ 38 */
39 public static int BONUS_DISAPPEARING_TICKS = EXPLOSION_TICKS; 39 int BONUS_DISAPPEARING_TICKS = EXPLOSION_TICKS;
40 40
41} 41}