edit calc paths

Author: mhdmohammadi

Diff for: src/Client/Model/Game.java

@@ -807,10 +807,16 @@ private void calcPathsFromPlayer(Player player) {
         Cell friendKingCell = getPlayerKing(getFriendIdOfPlayer(player.getPlayerId())).getCenter();
 
         List<Path> paths = new ArrayList<>();
-        for (Path path : initMessage.getMap().getPaths())
-            if (path.getCells().indexOf(playerKingCell) == 0 || path.getCells().lastIndexOf(playerKingCell) == path.getCells().size() - 1)
-                if (!path.getCells().contains(friendKingCell))
-                    paths.add(path);
+        for (Path path : initMessage.getMap().getPaths()) {
+            if (path.getCells().indexOf(playerKingCell) == 0 || path.getCells().indexOf(playerKingCell) == path.getCells().size() - 1) {
+                if (!path.getCells().contains(friendKingCell)){
+                    Path newPath = path.copy();
+                    if(newPath.getCells().indexOf(playerKingCell) != 0)
+                        Collections.reverse(newPath.getCells());
+                    paths.add(newPath);
+                }
+            }
+        }
         player.setPathsFromPlayer(paths);
     }
 
@@ -826,8 +832,12 @@ private void calcPathToFriend(Player player) {
         for (Path path : initMessage.getMap().getPaths()) {
             List<Cell> pathCells = path.getCells();
             if (pathCells.indexOf(playerKingCell) == 0 || pathCells.lastIndexOf(playerKingCell) == pathCells.size() - 1)
-                if (pathCells.indexOf(friendKingCell) == 0 || pathCells.lastIndexOf(friendKingCell) == pathCells.size() - 1)
-                    player.setPathToFriend(path);
+                if (pathCells.indexOf(friendKingCell) == 0 || pathCells.lastIndexOf(friendKingCell) == pathCells.size() - 1) {
+                    Path newPath = path.copy();
+                    if(newPath.getCells().indexOf(playerKingCell) != 0)
+                        Collections.reverse(newPath.getCells());
+                    player.setPathToFriend(newPath);
+                }
         }
     }
 

Diff for: src/Client/Model/Path.java

@@ -1,5 +1,6 @@
 package Client.Model;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -20,6 +21,14 @@ public boolean equals(Object object) {
         return false;
     }
 
+    public Path copy(){
+        Path newPath = new Path();
+        newPath.setId(this.id);
+        List<Cell> newList = new ArrayList<>(this.cells);
+        newPath.setCells(newList);
+        return newPath;
+    }
+
     public int getId() {
         return id;
     }