on test moves original square == null instead of captured piece

King.java

@@ -1,66 +1,66 @@
-import java.util.*;
+import java.util.*;
-import javax.swing.ImageIcon;
+import javax.swing.ImageIcon;
-
+
-public class King extends Piece {
+public class King extends Piece {
-  boolean hasMoved;
+  boolean hasMoved;
-  static int[] xDir = {-1, 0, 1, -1, 1, -1, 0, 1};
+  static int[] xDir = {-1, 0, 1, -1, 1, -1, 0, 1};
-  static int[] yDir = {-1, -1, -1, 0, 0, 1, 1, 1};
+  static int[] yDir = {-1, -1, -1, 0, 0, 1, 1, 1};
-
+
-  public King(int x, int y, String color) {
+  public King(int x, int y, String color) {
-    super(x, y, color, new ImageIcon("sprites/" + color + "/king.png").getImage());
+    super(x, y, color, new ImageIcon("sprites/" + color + "/king.png").getImage());
-    hasMoved = false;
+    hasMoved = false;
-  }
+  }
-
+
-  public Piece copy() {
+  public Piece copy() {
-    Piece newP = new King(this.pos.x, this.pos.y, this.color);
+    Piece newP = new King(this.pos.x, this.pos.y, this.color);
-    return newP;
+    return newP;
-  }
+  }
-
+
-  public ArrayList<Position> getPseudoLegalMoves(Board board) {
+  public ArrayList<Position> getPseudoLegalMoves(Board board) {
-    ArrayList<Position> positions = new ArrayList<Position>();
+    ArrayList<Position> positions = new ArrayList<Position>();
-
+
-    for (int i = 0; i < xDir.length; i++) {
+    for (int i = 0; i < xDir.length; i++) {
-      Position test = new Position(pos.x + xDir[i], pos.y + yDir[i]);
+      Position test = new Position(pos.x + xDir[i], pos.y + yDir[i]);
-      if (!Board.inBounds(test)) continue;
+      if (!Board.inBounds(test)) continue;
-      if (board.isOpen(test)) {
+      if (board.isOpen(test)) {
-        positions.add(test);
+        positions.add(test);
-        continue;
+        continue;
-      }
+      }
-      if (!board.getPiece(test).colorMatches(this)) {
+      if (!board.getPiece(test).colorMatches(this)) {
-        positions.add(test);
+        positions.add(test);
-      }
+      }
-    }
+    }
-
+
-    return positions;
+    return positions;
-  }
+  }
-
+
-  public ArrayList<Position> getLegalMoves(Board board) {
+  public ArrayList<Position> getLegalMoves(Board board) {
-    ArrayList<Position> positions = getPseudoLegalMoves(board);
+    ArrayList<Position> positions = getPseudoLegalMoves(board);
-    for (Position p : new ArrayList<>(positions)) {
+    for (Position p : new ArrayList<>(positions)) {
-      Piece tempPiece = board.getPiece(p);
+      Piece tempPiece = board.getPiece(p);
-      board.setPiece(pos, tempPiece);
+      board.setPiece(pos, null);
-      board.setPiece(p, this);
+      board.setPiece(p, this);
-      if (inCheck(board, p)) {
+      if (inCheck(board, p)) {
-        positions.remove(p);
+        positions.remove(p);
-      }
+      }
-      board.setPiece(p, tempPiece);
+      board.setPiece(p, tempPiece);
-      board.setPiece(pos, this);
+      board.setPiece(pos, this);
-    }
+    }
-    return positions;
+    return positions;
-  }
+  }
-
+
-  public boolean inCheck(Board board, Position pos) {
+  public boolean inCheck(Board board, Position pos) {
-    for (Piece[] pieces : board.board) {
+    for (Piece[] pieces : board.board) {
-      for (Piece p : pieces) {
+      for (Piece p : pieces) {
-        if (p == null) continue;
+        if (p == null) continue;
-        if (!p.colorMatches(this) && !(p instanceof King)) {
+        if (!p.colorMatches(this) && !(p instanceof King)) {
-          ArrayList<Position> ar = p.getLegalMoves(board);
+          ArrayList<Position> ar = p.getPseudoLegalMoves(board);
-          for (Position posi : ar) {
+          for (Position posi : ar) {
-            if (pos.equals(posi)) return true;
+            if (pos.equals(posi)) return true;
-          }
+          }
-        }
+        }
-      }
+      }
-    }
+    }
-    return false;
+    return false;
-  }
+  }
-}
+}