From 5fc3b9325d72f5a1622aa046c900221ba4598ca9 Mon Sep 17 00:00:00 2001
From: Andrew Guibert <andy.guibert@gmail.com>
Date: Fri, 11 May 2018 16:56:53 -0500
Subject: [PATCH] Fix player 3 starting direction for CrossSlice map

---
 .../main/java/org/libertybikes/game/maps/CrossSlice.java   | 6 +++---
 .../src/main/java/org/libertybikes/game/maps/GameMap.java  | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/game-service/src/main/java/org/libertybikes/game/maps/CrossSlice.java b/game-service/src/main/java/org/libertybikes/game/maps/CrossSlice.java
index 6b613a2..b4aaa3d 100644
--- a/game-service/src/main/java/org/libertybikes/game/maps/CrossSlice.java
+++ b/game-service/src/main/java/org/libertybikes/game/maps/CrossSlice.java
@@ -2,9 +2,9 @@ package org.libertybikes.game.maps;
 
 import org.libertybikes.game.core.DIRECTION;
 import org.libertybikes.game.core.GameBoard;
+import org.libertybikes.game.core.GameBoard.Point;
 import org.libertybikes.game.core.MovingObstacle;
 import org.libertybikes.game.core.Obstacle;
-import org.libertybikes.game.core.GameBoard.Point;
 
 public class CrossSlice extends GameMap {
 
@@ -21,8 +21,8 @@ public class CrossSlice extends GameMap {
         startingPoints = new Point[] {
                                        new Point(GameBoard.BOARD_SIZE / 2 - 15, GameBoard.BOARD_SIZE / 2 - 15),
                                        new Point(GameBoard.BOARD_SIZE / 2 + 15, GameBoard.BOARD_SIZE / 2 - 15),
-                                       new Point(GameBoard.BOARD_SIZE / 2 - 15, GameBoard.BOARD_SIZE / 2 + 15),
-                                       new Point(GameBoard.BOARD_SIZE / 2 + 15, GameBoard.BOARD_SIZE / 2 + 15)
+                                       new Point(GameBoard.BOARD_SIZE / 2 + 15, GameBoard.BOARD_SIZE / 2 + 15),
+                                       new Point(GameBoard.BOARD_SIZE / 2 - 15, GameBoard.BOARD_SIZE / 2 + 15)
         };
         startingDirections = new DIRECTION[] { DIRECTION.UP, DIRECTION.RIGHT, DIRECTION.DOWN, DIRECTION.LEFT };
     }
diff --git a/game-service/src/main/java/org/libertybikes/game/maps/GameMap.java b/game-service/src/main/java/org/libertybikes/game/maps/GameMap.java
index 44c0bb7..e9455cf 100644
--- a/game-service/src/main/java/org/libertybikes/game/maps/GameMap.java
+++ b/game-service/src/main/java/org/libertybikes/game/maps/GameMap.java
@@ -2,7 +2,7 @@ package org.libertybikes.game.maps;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.ThreadLocalRandom;
+import java.util.Random;
 
 import org.libertybikes.game.core.DIRECTION;
 import org.libertybikes.game.core.GameBoard;
@@ -12,13 +12,16 @@ import org.libertybikes.game.core.Obstacle;
 
 public class GameMap {
 
+    public static final int NUM_MAPS = 4; // Not including empty map
+    private static final Random r = new Random();
+
     /**
      * @param map -1=random, 0=empty, >0=specific map
      */
     public static GameMap create(int map) {
         switch (map) {
             case -1:
-                return create(ThreadLocalRandom.current().nextInt(1, 5));
+                return create(r.nextInt(NUM_MAPS) + 1);
             case 0:
                 return new EmptyMap();
             case 1: