Aleandro/Progetto-ingegneria-del-software
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: public attribute are now private with getter/setter, useless synchronized removed

Browse Source
This commit is contained in:
aleandro
2026-06-10 16:07:24 +02:00
parent e45a5bbb98
commit 709d1743d0
12 changed files with 63 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/it/polimi/ingsw/gc14/Model/Game.java
+24 -17
View File
@@ -102,7 +102,7 @@ public class Game implements Serializable {
}
else
{
while(disconnetedPlayers.containsKey(nextPlayer)&& disconnetedPlayers.get(nextPlayer))
while(disconnectedPlayers.containsKey(nextPlayer)&& disconnectedPlayers.get(nextPlayer))
{
nextPlayer.setTotem(getAvailableTotems().get(new Random().nextInt(0,getAvailableTotems().size())));
nextPlayer=totemChoiceQueue.poll();
@@ -121,7 +121,7 @@ public class Game implements Serializable {
/**
* Map tracking the players who are currently disconnected.
*/
public Map<Player,Boolean> disconnetedPlayers = new HashMap<>();
public Map<Player,Boolean> disconnectedPlayers = new HashMap<>();
/**
* Marks the specified player as disconnected and updates the game flow accordingly.
@@ -137,11 +137,11 @@ public class Game implements Serializable {
*/
public synchronized boolean disconnectedPlayer(Player player)
{
if(disconnetedPlayers.containsKey(player) && disconnetedPlayers.get(player))
if(disconnectedPlayers.containsKey(player) && disconnectedPlayers.get(player))
{
return false;
}
disconnetedPlayers.put(player,true);
disconnectedPlayers.put(player,true);
if (currentState.getGameStage().equals(GameStages.WAITING)) {
playersList.remove(player);
totemChoiceQueue.remove(player);
@@ -179,14 +179,14 @@ public class Game implements Serializable {
*/
public synchronized boolean reconnectPlayer(Player player)
{
if(!disconnetedPlayers.containsKey(player))
if(!disconnectedPlayers.containsKey(player))
{
return false;
}
disconnetedPlayers.put(player,false);
disconnectedPlayers.put(player,false);
if(currentState.getGameStage().equals(GameStages.SLOT_CHOICE) )
{
disconnetedPlayers.remove(player);
disconnectedPlayers.remove(player);
if(!orderLogicCard.players.contains(player))
{
orderLogicCard.pushNoEffect(player);
@@ -195,7 +195,7 @@ public class Game implements Serializable {
else if(currentState.getGameStage().equals(GameStages.RES_ACTIONS)) {
if(slotMap.containsValue(player))
{
disconnetedPlayers.remove(player);
disconnectedPlayers.remove(player);
}
}
return true;
@@ -206,7 +206,7 @@ public class Game implements Serializable {
*/
public synchronized void ClearDisconnected()
{
disconnetedPlayers.clear();
disconnectedPlayers.clear();
}
/**
@@ -252,7 +252,14 @@ public class Game implements Serializable {
/**
* The order logic card associated with this game.
*/
public OrderLogicCard orderLogicCard;
private OrderLogicCard orderLogicCard;
/**
* Returns the order logic card associated with this game.
*
* @return the order logic card.
*/
public OrderLogicCard getOrderLogicCard() { return orderLogicCard; }
/**
* The board associated with this game.
@@ -698,7 +705,7 @@ public class Game implements Serializable {
if (GameStages.SLOT_CHOICE == currentState.getGameStage()) {
Player tempPlayer = orderLogicCard.pull();
if(disconnetedPlayers.containsKey(tempPlayer) && disconnetedPlayers.get(tempPlayer)) {
if(disconnectedPlayers.containsKey(tempPlayer) && disconnectedPlayers.get(tempPlayer)) {
nextPlayerSetup();
return;
}
@@ -750,7 +757,7 @@ public class Game implements Serializable {
for (Map.Entry<Slot,Player> entry : slotMap.entrySet()) {
if (entry.getValue() != null) {
if(disconnetedPlayers.containsKey(entry.getValue())&&disconnetedPlayers.get(entry.getValue()))
if(disconnectedPlayers.containsKey(entry.getValue())&& disconnectedPlayers.get(entry.getValue()))
{
orderLogicCard.push(entry.getValue());
entry.setValue(null);
@@ -782,7 +789,7 @@ public class Game implements Serializable {
if (optionalPlayer != null) {
currentState.PlayerUpdate(optionalPlayer, null);
if(disconnetedPlayers.containsKey(currentState.getCurrentPlayer())&& disconnetedPlayers.get(currentState.getCurrentPlayer())) {
if(disconnectedPlayers.containsKey(currentState.getCurrentPlayer())&& disconnectedPlayers.get(currentState.getCurrentPlayer())) {
nextPlayerSetup();
}
return;
@@ -815,7 +822,7 @@ public class Game implements Serializable {
for (Player p :playersList) {
long count = p.getBuildingCards().stream().filter(x -> x.getEffectId() == 12).count();
if (count > 0) {
if(disconnetedPlayers.containsKey(p)&& disconnetedPlayers.get(p))
if(disconnectedPlayers.containsKey(p)&& disconnectedPlayers.get(p))
{
continue;
}
@@ -832,12 +839,12 @@ public class Game implements Serializable {
if (currentState.getRound() < 10) {
nextRound();
for(Map.Entry<Player,Boolean> entry: disconnetedPlayers.entrySet())
for(Map.Entry<Player,Boolean> entry: disconnectedPlayers.entrySet())
{
if(!entry.getValue())
{
orderLogicCard.pushNoEffect(entry.getKey());
disconnetedPlayers.remove(entry.getKey());
disconnectedPlayers.remove(entry.getKey());
}
else
{
@@ -999,7 +1006,7 @@ public class Game implements Serializable {
* ordered by prestige value and, in case of a tie, by food value.
*/
public synchronized void endGameForFeit() {
Player winner=playersList.stream().filter(x->!disconnetedPlayers.containsKey(x)||!disconnetedPlayers.get(x)).toList().get(0);
Player winner=playersList.stream().filter(x->!disconnectedPlayers.containsKey(x)||!disconnectedPlayers.get(x)).toList().get(0);
currentState.GameStageUpdate(GameStages.ENDED);
playerStanding=new ArrayList<>(playersList);
playerStanding.remove(winner);