#676 Fix planetary status happiness explanation.

#692 MusicTest no longer enables music after testing it silently.
tuomount · Apr 27, 2024 · c2884ab · c2884ab
1 parent 3a25be9
commit c2884ab
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/main/java/org/openRealmOfStars/starMap/planet/Planet.java b/src/main/java/org/openRealmOfStars/starMap/planet/Planet.java
@@ -4094,18 +4094,18 @@ public int calculateHappiness() {
       sb.append(bonusBuildings);
       sb.append("<br>");
     }
-    int statusesBonus = statuses.stream()
-        .map(status -> status.getStatus().getHappinessBonus())
-        .reduce(0, (acc, b) -> acc + b);
-    if (statusesBonus != 0) {
-      sb.append("<li>");
-      sb.append(event.getName());
-      if (statusesBonus > 0) {
-        sb.append("+");
-      }
-      base = base + statusesBonus;
-      sb.append(statusesBonus);
-      sb.append("<br>");
+    for (AppliedStatus status : statuses) {
+      int statusBonus = status.getStatus().getHappinessBonus();
+      if (statusBonus != 0) {
+          sb.append("<li>");
+          sb.append(status.getStatus().getName());
+          if (statusBonus > 0) {
+            sb.append("+");
+          }
+          base = base + statusBonus;
+          sb.append(statusBonus);
+          sb.append("<br>");
+        }
     }
     int totalWarFatigue = planetOwnerInfo.getTotalWarFatigue();
     base = base + totalWarFatigue;

diff --git a/src/test/java/org/openRealmOfStars/audio/music/MusicPlayerTest.java b/src/test/java/org/openRealmOfStars/audio/music/MusicPlayerTest.java
@@ -66,7 +66,7 @@ public void testMusicPlayerByPlayingOgg() throws InterruptedException {
       }
     }
     assertEquals(true, found);
-    MusicPlayer.setMusicEnabled(true);
+    MusicPlayer.setMusicEnabled(false);
 
   }