ZU VIEL gemacht

Mein Brain ist kaputt

User.java

@@ -6,18 +6,18 @@ public class User {
 	private String username;
 	private String password;
 	private int timesPlayed;
-	private int winPercentage;
+	private float winPercentage;
 	private int currentStreak;
 	private int maxStreak;
 	private int lastDayWOTDPlayed;
 	private int state;
-	private int wins;
 	private int[] wonInTurn;
 	private Game game;
 
 	public User(String pConnectionID) {
 		connectionID = pConnectionID;
 		game = new Game();
+		wonInTurn = new int[6];
 	}
 
 	public Game getGame() {
@@ -48,11 +48,7 @@ public class User {
 		return state;
 	}
 
-	public void setWins(int wins) {
-		this.wins = wins;
-	}
-
-	public int getWinPercentage() {
+	public float getWinPercentage() {
 		return winPercentage;
 	}
 
@@ -72,10 +68,6 @@ public class User {
 		return username;
 	}
 
-	public int getWins() {
-		return wins;
-	}
-
 	public void setConnectionID(String connectionID) {
 		this.connectionID = connectionID;
 	}
@@ -108,29 +100,29 @@ public class User {
 		this.username = username;
 	}
 
-	public void setWinPercentage(int winPercentage) {
+	public void setWinPercentage(float winPercentage) {
 		this.winPercentage = winPercentage;
 	}
 
-	public void setWonInTurnIndex(int index, int content) {
-		this.wonInTurn[index] = content;
+	public void setWonInTurnIndex(int content, int index) {
+		wonInTurn[index] = content;
 	}
 
-	public void setWonInTurn(int[] wonInTurn) {
-		this.wonInTurn = wonInTurn;
+	public void increaseWonInTurnIndex(int index) {
+		wonInTurn[index]++;
 	}
 
 	public boolean loggedIn() {
-		return password != null && username != null;
+		if (password != null && username != null) {
+			return (!password.equals("") && !username.equals(""));
+		} else {
+			return false;
+		}
 	}
 
 	public String[] getLastGuesses() {
 		return game.getGuesses();
 	}
-	
-	public void setLastGuesses(String[] guesses) {
-		game.setGuesses(guesses);
-	}
 
 	public void setLastDayWOTDPlayed(int time) {
 		lastDayWOTDPlayed = time;