From 092b8991cd41d6b9fef12777e3ff8e04feddb760 Mon Sep 17 00:00:00 2001 From: AleandroPagani Date: Wed, 8 Apr 2026 18:44:28 +0200 Subject: [PATCH] ShamanicRitual: fixed edge case when everybody has the same icons ShamanicRitualTest: fixed --- .../gc14/Model/Cards/TribeCards/Events/ShamanicRitual.java | 2 +- .../Model/Cards/TribeCards/Events/ShamanicRitualTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitual.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitual.java index 00550ca..763e863 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitual.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitual.java @@ -68,7 +68,7 @@ public class ShamanicRitual extends EventCard { int minIcon = playerMap.values().stream().mapToInt(Integer::intValue).min().orElse(0); List maxIconsPlayer = playerMap.entrySet().stream().filter(e -> e.getValue() == maxIcon).map(Map.Entry::getKey).collect(Collectors.toList()); - List minIconsPlayer = playerMap.entrySet().stream().filter(e -> e.getValue() == minIcon).map(Map.Entry::getKey).filter(player -> !maxIconsPlayer.contains(player)).collect(Collectors.toList()); + List minIconsPlayer = playerMap.entrySet().stream().filter(e -> e.getValue() == minIcon).map(Map.Entry::getKey).collect(Collectors.toList()); for (Player player : maxIconsPlayer) { diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitualTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitualTest.java index dc7d5f2..6d16b66 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitualTest.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitualTest.java @@ -65,8 +65,8 @@ class ShamanicRitualTest { ShamanicRitual ritual = new ShamanicRitual(1, 10, 5); ritual.activateEvent(players); - assertEquals(10, p1.getPrestigeValue()); - assertEquals(10, p2.getPrestigeValue()); + assertEquals(5, p1.getPrestigeValue()); + assertEquals(5, p2.getPrestigeValue()); } @Test