Hunting the bug

Author: Jendoliver

META-INF/MANIFEST.MF

@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Main-Class: com.apporelbotna.gameserver.pongserver.Main

src/main/java/com/apporelbotna/gameserver/pongserver/model/MatchmakerQueue.java

@@ -8,9 +8,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.apporelbotna.gameserver.persistencewsclient.GameDAO;
 import com.apporelbotna.gameserver.pongserver.properties.ApplicationProperties;
 import com.apporelbotna.gameserver.pongserver.stubs.model.Player;
 import com.apporelbotna.gameserver.pongserver.stubs.net.SocketConnection;
+import com.apporelbotna.gameserver.stubs.Token;
+import com.apporelbotna.gameserver.stubs.User;
 
 /**
  * This is the PongServer's main thread, which accepts connections from players and starts a new
@@ -28,6 +31,8 @@ public class MatchmakerQueue implements Matchmaker
 
 	private static ServerSocket serverSocket;
 
+	private GameDAO gameDAO;
+
 	public MatchmakerQueue()
 	{
 		try
@@ -40,6 +45,7 @@ public MatchmakerQueue()
 		}
 		playerQueue = new LinkedList<>();
 		logger.info("Server is running");
+		gameDAO = new GameDAO();
 	}
 
 	@Override
@@ -57,7 +63,9 @@ public PlayerConnection acceptPlayer()
 			playerListener = new SocketConnection(serverSocket.accept());
 			String playerEmail = playerListener.readLine();
 			String playerToken = playerListener.readLine();
-			return new PlayerConnection(new Player(playerEmail, playerToken), playerListener);
+			gameDAO = new GameDAO();
+			User user = gameDAO.getUserInformation(playerEmail);
+			return new PlayerConnection(new Player(user, new Token(playerToken)), playerListener);
 		}
 		catch (IOException e)
 		{

src/main/java/com/apporelbotna/gameserver/pongserver/properties/application.properties

@@ -1,4 +1,4 @@
-version=1.0.9
+version=1.0.10
 name=PongServer
 
 server.ip=localhost

src/main/java/com/apporelbotna/gameserver/pongserver/stubs/model/Ball.java

@@ -37,13 +37,13 @@ public void spawnAtCenter()
 		this.position = new Vector2(INITIAL_X, INITIAL_Y);
 
 		// FIXME el random no se genera bien
-		int initialVelocityX = random.nextInt(2) - 1;
-		while (initialVelocityX == 0)
-			initialVelocityX = random.nextInt(2) - 1;
-		int initialVelocityY = random.nextInt(2) - 1;
-		while (initialVelocityY == 0)
-			initialVelocityY = random.nextInt(2) - 1;
-		this.velocity = new Vector2(initialVelocityX, initialVelocityY);
+//		int initialVelocityX = random.nextInt(2) - 1;
+//		while (initialVelocityX == 0)
+//			initialVelocityX = random.nextInt(2) - 1;
+//		int initialVelocityY = random.nextInt(2) - 1;
+//		while (initialVelocityY == 0)
+//			initialVelocityY = random.nextInt(2) - 1;
+		this.velocity = new Vector2(1, 1);
 	}
 
 	public Ball mirrorPositionX()

src/main/java/com/apporelbotna/gameserver/pongserver/stubs/model/Player.java

@@ -24,6 +24,11 @@ public Player(String email, String tokenKey)
 		this(new UserWrapper(new User(email), new Token(tokenKey)));
 	}
 
+	public Player(User user, Token token)
+	{
+		this(new UserWrapper(user, token));
+	}
+
 	public UserWrapper getUserWrapper()
 	{
 		return userWrapper;