1 files changed, 6 insertions, 6 deletions

diff --git a/src/ch/epfl/maze/physical/World.java b/src/ch/epfl/maze/physical/World.java
index 257fa65..9f4f155 100644
--- a/src/ch/epfl/maze/physical/World.java
+++ b/src/ch/epfl/maze/physical/World.java
@@ -7,6 +7,7 @@ import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * World that is represented by a labyrinth of tiles in which an {@code Animal}
@@ -136,13 +137,12 @@ public abstract class World {
      * @return A set of all available choices at a position
      */
     public final Set<Direction> getChoiceSet(Vector2D position) {
-        Set<Direction> choices = EnumSet.noneOf(Direction.class);
+        Set<Direction> freeDirections = Direction.MOVING_DIRECTIONS
+                .stream()
+                .filter(dir -> this.isFree(position.addDirectionTo(dir)))
+                .collect(Collectors.toSet());
 
-        for (Direction dir : Direction.POSSIBLE_DIRECTIONS)
-            if (this.isFree(position.addDirectionTo(dir)))
-                choices.add(dir);
-
-        return choices.isEmpty() ? EnumSet.of(Direction.NONE) : choices;
+        return freeDirections.isEmpty() ? EnumSet.of(Direction.NONE) : freeDirections;
     }
 
     /**