Fix newing player in new game and CastSpell bug

Author: taslimisina

src/Client/Controller.java

@@ -130,7 +130,6 @@ private void handleMessage(Message msg)
      */
     private void handleInitMessage(Message msg)
     {
-        game = new Game(game);
         ClientInitMessage clientInitMessage = Json.GSON.fromJson(msg.getInfo(), ClientInitMessage.class);
         game.handleInitMessage(clientInitMessage);
         Message endMsg = new Message("endTurn", new JsonObject(), 0);

src/Client/Model/Game.java

@@ -6,6 +6,7 @@
 
 import java.util.*;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 import com.google.gson.JsonObject;
 import common.network.Json;
@@ -34,7 +35,8 @@ public Game(Game game) {
         this.initMessage = game.getInitMessage();
         this.sender = game.getSender();
         this.spellsByTypeId = game.spellsByTypeId;
-        players = game.getPlayers();
+
+        this.players = game.getPlayers().stream().map(Player::new).collect(Collectors.toList());
     }
 
     public HashMap<Integer, BaseUnit> getBaseUnitsById() {
@@ -534,16 +536,16 @@ private void calcUnitsById() {
     }
 
     private void calcMyTurnSpells() {
-        players.get(0).setSpells(getSpellsByIds(clientTurnMessage.getMySpells()));
-        players.get(0).calcTurnSpells();
+        getMe().setSpells(getSpellsByIds(clientTurnMessage.getMySpells()));
+        getMe().calcTurnSpells();
     }
 
     private void calcMyFriendTurnSpells() {
-        players.get(1).setSpells(getSpellsByIds(clientTurnMessage.getFriendSpells()));
-        players.get(1).calcTurnSpells();
+        getFriend().setSpells(getSpellsByIds(clientTurnMessage.getFriendSpells()));
+        getFriend().calcTurnSpells();
     }
 
-    private void calcPlayerplayedUnits(Player player) {
+    private void calcPlayerPlayedUnits(Player player) {
         List<Unit> playedUnits = new ArrayList<>();
         for (TurnUnit turnUnit : clientTurnMessage.getUnits())
             if (turnUnit.getPlayerId() == player.getPlayerId() && turnUnit.isWasPlayedThisTurn())
@@ -553,7 +555,7 @@ private void calcPlayerplayedUnits(Player player) {
 
     private void calcPlayersPlayedUnits() {
         for (Player player : players)
-            calcPlayerplayedUnits(player);
+            calcPlayerPlayedUnits(player);
     }
 
     private void calcCastAreaSpells() {

src/Client/Model/Player.java

@@ -12,11 +12,11 @@
 
 public class Player {
     private int playerId;
-    Path[][] shortestPathsToCellsCrossMyself;
+    private Path[][] shortestPathsToCellsCrossMyself;
     private List<BaseUnit> deck;
     private List<BaseUnit> hand;
     private List<Path> pathsFromPlayer = new ArrayList<>();
-    Path[][] shortestPathsToCells;
+    private Path[][] shortestPathsToCells;
     private Path pathToFriend;
     private List<Unit> units = new ArrayList<>();
     private CastAreaSpell castAreaSpell;
@@ -39,6 +39,12 @@ public Player(int playerID) {
         this.playerId = playerID;
     }
 
+    public Player(Player player) {
+        this.playerId = player.getPlayerId();
+        this.shortestPathsToCellsCrossMyself = player.getShortestPathsToCellsCrossMyself();
+        this.shortestPathsToCells = player.getShortestPathsToCells();
+    }
+
     public int getPlayerId() {
         return playerId;
     }