diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Game.java b/src/main/java/it/polimi/ingsw/gc14/Model/Game.java index 0b200b4..910d874 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Game.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Game.java @@ -266,9 +266,7 @@ public class Game implements Serializable { * @return a list containing clones of the upper tribe cards currently available on the board. */ public ArrayListgetUpperListTribeCards() { - ArrayList cards = new ArrayList<>(); - board.upperListTribe.forEach(x->cards.add(x.clone())); - return cards; + return (ArrayList)board.upperListTribe; } /** @@ -277,9 +275,7 @@ public class Game implements Serializable { * @return a list containing clones of the lower tribe cards currently available on the board. */ public ArrayListgetLowerListTribeCards() { - ArrayList cards = new ArrayList<>(); - board.lowerListTribe.forEach(x->cards.add(x.clone())); - return cards; + return (ArrayList )board.lowerListTribe; } /** @@ -288,9 +284,7 @@ public class Game implements Serializable { * @return a list containing clones of the upper building cards currently available on the board. */ public ArrayListgetUpperListBuilding() { - ArrayList cards = new ArrayList<>(); - board.upperListBuilding.forEach(x->cards.add(x.clone())); - return cards; + return (ArrayList)board.upperListBuilding; } /** @@ -299,9 +293,7 @@ public class Game implements Serializable { * @return a list containing clones of the lower building cards currently available on the board. */ public ArrayListgetLowerListBuilding() { - ArrayList cards = new ArrayList<>(); - board.lowerListBuilding.forEach(x->cards.add(x.clone())); - return cards; + return (ArrayList) board.lowerListBuilding; } /** diff --git a/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java b/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java index fccdeea..5f91a4a 100644 --- a/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java +++ b/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java @@ -492,7 +492,7 @@ public class MainFXMLController { rect.setArcWidth(4); rect.setArcHeight(4); if (controller.miniModel.slotPlayerMap.containsValue(op.player)) { - rect.setOpacity(0.5); + rect.setVisible(false); } final double yRatio = positions[i];