Moved collision check walls to player walkLeft and walkRight method.

src/model/objects/Player.java

@@ -3,6 +3,8 @@ package model.objects;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 
+import main.Window;
+
 public class Player extends DrawObject {
 
 	private int score, health, speed = 10;
@@ -34,15 +36,19 @@ public class Player extends DrawObject {
 	}
 	
 	public void walkLeft(){
-		setX(getX()-speed);
-		lastDirection = 1;
-		lastMovement = System.currentTimeMillis();
+		if(getX() -30 - speed > 0){
+			setX(getX()-speed);
+			lastDirection = 1;
+			lastMovement = System.currentTimeMillis();	
+		}
 	}
 	
 	public void walkRight(){
-		setX(getX()+speed);
-		lastDirection = 2;
-		lastMovement = System.currentTimeMillis();
+		if(getX() + 30 + getWidth() + speed < Window.WIDTH){
+			setX(getX()+speed);
+			lastDirection = 2;
+			lastMovement = System.currentTimeMillis();
+		}
 	}
 	
 	//** Getters and Setters **//

src/model/objects/PowerUp.java

@@ -3,7 +3,7 @@ package model.objects;
 import java.awt.image.BufferedImage;
 
 public class PowerUp extends DrawObject {
-
+	
 	public PowerUp(BufferedImage image) {
 		super(image);
 	}

src/model/state/PlayState.java

@@ -51,15 +51,6 @@ public class PlayState extends State{
 			player.walkRight();
 		else if(direction == -1)
 			player.walkLeft();
-		
-		if(player.getX() + 30 + player.getWidth() >= Window.WIDTH)
-			{
-				player.setX(Window.WIDTH - 30 - player.getWidth()-1);
-			}
-			if(player.getX() - 30 <= 0)
-			{
-				player.setX(32);
-			}
 		player.update();
 		if(line != null){
 			line.setLength(line.getLength()+1);
@@ -93,9 +84,7 @@ public class PlayState extends State{
 
 	@Override
 	public void paint(Graphics2D g2d) {	
-		g2d.drawString("Press ESC to stop the game", Window.WIDTH/2, Window.HEIGHT/2);
 		g2d.drawImage(Images.getImage(ImageType.BACKGROUND),null,0,0);
-
 		if(line != null){
 			line.paint(g2d);
 		}