From 331880191369622751e46c72b79cac14092e08b6 Mon Sep 17 00:00:00 2001 From: aleandro Date: Tue, 9 Jun 2026 20:10:11 +0200 Subject: [PATCH] Fix: small bugs --- .../Model/Cards/TribeCards/Events/Sustenance.java | 11 +++++------ src/main/java/it/polimi/ingsw/gc14/Model/Game.java | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Sustenance.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Sustenance.java index 51856c3..067b5da 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Sustenance.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Sustenance.java @@ -72,15 +72,14 @@ public class Sustenance extends EventCard { int NGatherers = player.getNType(CharacterType.GATHERER); int NCharDiscount = 0; - for(Player p : playerList){ - for(BuildingCard b : player.buildingCards){ - if(b.getEffectId() == 1){ - CharacterType c = ((Building1)b).getIcon(); - NCharDiscount += p.getNType(c); - } + for(BuildingCard b : player.buildingCards){ + if(b.getEffectId() == 1){ + CharacterType c = ((Building1)b).getIcon(); + NCharDiscount += player.getNType(c); } } + int FoodDebt = NChar - (3 * NGatherers + NCharDiscount); if(FoodDebt <= 0){ 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 fcba1d8..d656038 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Game.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Game.java @@ -154,7 +154,7 @@ public class Game implements Serializable { } else { if (totemChoiceQueue.isEmpty()) { - player.totem = getAvailableTotems().get(new Random().nextInt(getAvailableTotems().size() - 1)); + player.totem = getAvailableTotems().get(new Random().nextInt(getAvailableTotems().size())); } else { totemChoiceQueue.add(player); }