aboutsummaryrefslogtreecommitdiff
path: root/src/ch
diff options
context:
space:
mode:
authorPacien TRAN-GIRARD2016-04-15 10:58:55 +0200
committerPacien TRAN-GIRARD2016-04-15 10:58:55 +0200
commit36e3b47ec524cd305e1a605a2736721fea308f17 (patch)
tree8890005c7b90482b993e37b3d534b2153841e2ba /src/ch
parent64498b20f7865a373fdad3ab6c3b61202208ae41 (diff)
downloadxblast-36e3b47ec524cd305e1a605a2736721fea308f17.tar.gz
Destroy bombs according to new blasts instead of the current ones
Diffstat (limited to 'src/ch')
-rw-r--r--src/ch/epfl/xblast/server/GameState.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/ch/epfl/xblast/server/GameState.java b/src/ch/epfl/xblast/server/GameState.java
index 4c30235..7d94c69 100644
--- a/src/ch/epfl/xblast/server/GameState.java
+++ b/src/ch/epfl/xblast/server/GameState.java
@@ -557,8 +557,7 @@ public final class GameState {
557 List<Sq<Sq<Cell>>> explosions1 = GameState.nextExplosions(this.explosions); 557 List<Sq<Sq<Cell>>> explosions1 = GameState.nextExplosions(this.explosions);
558 558
559 // 4.1. existing bombs evolution 559 // 4.1. existing bombs evolution
560 Set<Cell> blastedCells0 = this.blastedCells(); 560 List<Bomb> explodingBombs = GameState.explodingBombs(this.bombs, blastedCells1);
561 List<Bomb> explodingBombs = GameState.explodingBombs(this.bombs, blastedCells0);
562 List<Bomb> existingBombs = GameState.nextBombs(this.bombs, explodingBombs); 561 List<Bomb> existingBombs = GameState.nextBombs(this.bombs, explodingBombs);
563 562
564 // 4.2. subsequent explosions addition 563 // 4.2. subsequent explosions addition