1 files changed, 20 insertions, 2 deletions

diff --git a/src/ch/epfl/xblast/server/Player.java b/src/ch/epfl/xblast/server/Player.java
index 094d395..fdc4715 100644
--- a/src/ch/epfl/xblast/server/Player.java
+++ b/src/ch/epfl/xblast/server/Player.java
@@ -238,7 +238,7 @@ public final class Player {
 
         int newLives = lives() - 1;
 
-        if (newLives >= 0) {
+        if (newLives <= 0) {
             LifeState dead = new LifeState(newLives, LifeState.State.DEAD);
             nextLifeState = nextLifeState.concat(Sq.constant(dead));
         } else {
@@ -260,6 +260,13 @@ public final class Player {
     }
 
     /**
+     * @return the vulnerability state of the player
+     */
+    public boolean isVulnerable() {
+        return this.lifeState().state() == LifeState.State.VULNERABLE;
+    }
+
+    /**
      * @return the current number of lives of the player
      */
     public int lives() {
@@ -270,7 +277,7 @@ public final class Player {
      * @return true is the player has more than 0 lives
      */
     public boolean isAlive() {
-        return this.lives() >= 0;
+        return this.lives() > 0;
     }
 
     /**
@@ -329,4 +336,15 @@ public final class Player {
         return new Bomb(this.id(), this.position().containingCell(), Ticks.BOMB_FUSE_TICKS, this.bombRange());
     }
 
+    @Override
+    public String toString() {
+        return "Player{" +
+                "id=" + id +
+                ", lifeStates=" + lifeStates +
+                ", directedPos=" + directedPos +
+                ", maxBombs=" + maxBombs +
+                ", bombRange=" + bombRange +
+                '}';
+    }
+
 }