Merge remote-tracking branch 'origin/develop' into develop

server/server/match/Match.java

@@ -218,7 +218,7 @@ public class Match implements Runnable {
 		if (pid == 1)
 			line1 = new ShootingLine(player1.getX() + player1.getWidth() / 2, player1.getY() + player1.getHeigth());
 		if (pid == 2)
-			line2 = new ShootingLine(player2.getX(), player2.getY());
+			line2 = new ShootingLine(player2.getX() + player2.getWidth() / 2, player2.getY() + player2.getHeigth());
 	}
 
 	public void stopMatch() {