resolved conflict on Board... stupid tabs

john · Mar 28, 2016 · 1dc0297 · 1dc0297
2 parents 100adb6 + 4a8bb69
commit 1dc0297
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/src/model/Board.java b/src/model/Board.java
@@ -58,3 +58,4 @@ public boolean hasAttackVector(Piece p) {
 		return can_attack;
 	}
 }
+
diff --git a/src/model/Player.java b/src/model/Player.java
@@ -0,0 +1,29 @@
+package model;
+
+import java.util.ArrayList;
+
+public class Player {
+	private ArrayList<Piece> pieces;
+	private String name;
+
+	public Player(String name) {
+		this.name = name;
+		this.pieces = new ArrayList<Piece>();
+	}
+
+	public void addPiece(Piece p) {
+		pieces.add(p);
+	}
+
+	public ArrayList<Piece> getPieces() {
+		return pieces;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -58,3 +58,4 @@ public boolean hasAttackVector(Piece p) {
		return can_attack;
		}
		}