package pw.scho.battleship.model;

import java.util.UUID;

public class Game {

    private Board firstBoard;
    private Board secondBoard;
    private UUID firstPlayerId;
    private UUID secondPlayerId;
    private UUID id;

    public Game() {
        this.id = UUID.randomUUID();
    }

    public UUID getId() {
        return id;
    }

    public Board getFirstBoard() {
        return firstBoard;
    }

    public void setFirstBoard(Board firstBoard) {
        this.firstBoard = firstBoard;
    }

    public Board getSecondBoard() {
        return secondBoard;
    }

    public void setSecondBoard(Board secondBoard) {
        this.secondBoard = secondBoard;
    }

    public UUID getFirstPlayerId() {
        return firstPlayerId;
    }

    public void setFirstPlayerId(UUID firstPlayerId) {
        this.firstPlayerId = firstPlayerId;
    }

    public UUID getSecondPlayerId() {
        return secondPlayerId;
    }

    public void setSecondPlayerId(UUID secondPlayerId) {
        this.secondPlayerId = secondPlayerId;
    }
}

@@ -146,20 +146,22 @@
 private 
-UUID
+Player
  firstPl
@@ -160,26 +160,24 @@
  firstPlayer
-Id
 ;%0A    privat
@@ -178,20 +178,22 @@
 private 
-UUID
+Player
  secondP
@@ -193,26 +193,24 @@
 secondPlayer
-Id
 ;%0A    privat
@@ -277,32 +277,382 @@
 mUUID();%0A    %7D%0A%0A
+    public Player getSecondPlayer() %7B%0A        return secondPlayer;%0A    %7D%0A%0A    public void setSecondPlayer(Player secondPlayer) %7B%0A        this.secondPlayer = secondPlayer;%0A    %7D%0A%0A    public Player getFirstPlayer() %7B%0A        return firstPlayer;%0A    %7D%0A%0A    public void setFirstPlayer(Player firstPlayer) %7B%0A        this.firstPlayer = firstPlayer;%0A    %7D%0A%0A
     public UUID 
@@ -1023,373 +1023,7 @@
    %7D
-%0A%0A    public UUID getFirstPlayerId() %7B%0A        return firstPlayerId;%0A    %7D%0A%0A    public void setFirstPlayerId(UUID firstPlayerId) %7B%0A        this.firstPlayerId = firstPlayerId;%0A    %7D%0A%0A    public UUID getSecondPlayerId() %7B%0A        return secondPlayerId;%0A    %7D%0A%0A    public void setSecondPlayerId(UUID secondPlayerId) %7B%0A        this.secondPlayerId = secondPlayerId;%0A    %7D
 %0A%7D%0A

Replace player ids with player objects