From 22b615543b70fd011f8e5e7ed9d8ae82654e5b0c Mon Sep 17 00:00:00 2001
From: Timothée Floure
Date: Fri, 8 Apr 2016 11:48:47 +0200
Subject: Fix game duration

---
 src/ch/epfl/xblast/server/GameState.java | 2 +-
 src/ch/epfl/xblast/server/Ticks.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/ch/epfl/xblast/server/GameState.java b/src/ch/epfl/xblast/server/GameState.java
index 4ed1af5..3df5ebd 100644
--- a/src/ch/epfl/xblast/server/GameState.java
+++ b/src/ch/epfl/xblast/server/GameState.java
@@ -453,7 +453,7 @@ public final class GameState {
         List<Player> players1 = GameState.nextPlayers(
                 this.players, playerBonuses, bombedCells1, board1, blastedCells1, speedChangeEvents);
 
-        return new GameState(this.ticks, board1, players1, bombs1, explosions1, blasts1);
+        return new GameState(this.ticks + 1, board1, players1, bombs1, explosions1, blasts1);
     }
 
     /**
diff --git a/src/ch/epfl/xblast/server/Ticks.java b/src/ch/epfl/xblast/server/Ticks.java
index 3517491..b880dd7 100644
--- a/src/ch/epfl/xblast/server/Ticks.java
+++ b/src/ch/epfl/xblast/server/Ticks.java
@@ -53,7 +53,7 @@ public interface Ticks {
     /**
      * Duration of a game (in seconds).
      */
-    int GAME_DURATION = 2;
+    int GAME_DURATION = 120;
 
     /**
      * Total number of ticks during a game.
-- 
cgit v1.2.3