aboutsummaryrefslogtreecommitdiff
path: root/src/ch/epfl
diff options
context:
space:
mode:
authorTimothée Floure2016-02-29 13:54:26 +0100
committerTimothée Floure2016-02-29 13:54:26 +0100
commit3fd6365255ba761f45f34bff3fef27a28b3a1785 (patch)
treee8335f9836c5672fd26cc04dc4ad16613a79212d /src/ch/epfl
parent746aafc3f0e8212282a5fbf31de7a83d2a618dc8 (diff)
downloadxblast-3fd6365255ba761f45f34bff3fef27a28b3a1785.tar.gz
Fix typo in comment + remove tests on null input
Diffstat (limited to 'src/ch/epfl')
-rw-r--r--src/ch/epfl/xblast/server/Board.java1
-rw-r--r--src/ch/epfl/xblast/server/Ticks.java2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/ch/epfl/xblast/server/Board.java b/src/ch/epfl/xblast/server/Board.java
index c8d3e01..fa91587 100644
--- a/src/ch/epfl/xblast/server/Board.java
+++ b/src/ch/epfl/xblast/server/Board.java
@@ -117,7 +117,6 @@ public final class Board {
117 117
118 rowsList.add(Lists.<Block>mirrored(halfInnerBoard.get(i))); 118 rowsList.add(Lists.<Block>mirrored(halfInnerBoard.get(i)));
119 } 119 }
120
121 return ofInnerBlocksWalled(rowsList); 120 return ofInnerBlocksWalled(rowsList);
122 } 121 }
123} 122}
diff --git a/src/ch/epfl/xblast/server/Ticks.java b/src/ch/epfl/xblast/server/Ticks.java
index 8c1e134..8793adb 100644
--- a/src/ch/epfl/xblast/server/Ticks.java
+++ b/src/ch/epfl/xblast/server/Ticks.java
@@ -12,7 +12,7 @@ public interface Ticks {
12 public static int PLAYER_INVULNERABLE_TICKS = 64; 12 public static int PLAYER_INVULNERABLE_TICKS = 64;
13 13
14 /** 14 /**
15 * Duration of 15 * Duration of the timer of a bomb.
16 */ 16 */
17 public static int BOMB_FUSE_TICKS = 100; 17 public static int BOMB_FUSE_TICKS = 100;
18 18