fix vote count

ModFest · Jul 15, 2024 · 34177ae · 34177ae
1 parent 3dc4378
commit 34177ae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -7,6 +7,6 @@ org.gradle.configureondemand=true
 # Enable advanced multi-module optimizations (share tiny-remaper instance between projects)
 fabric.loom.multiProjectOptimisation=true
 # Mod Properties
-baseVersion = 0.3.0
+baseVersion = 0.3.1
 defaultBranch = 1.21
 branch = 1.21
diff --git a/src/main/java/net/modfest/ballotbox/BallotBoxCommands.java b/src/main/java/net/modfest/ballotbox/BallotBoxCommands.java
@@ -63,7 +63,7 @@ private static int votes(ServerPlayerEntity player, String ignored, Consumer<Tex
                 votes.computeIfAbsent(BallotBoxPlatformClient.categories.get(category), k -> HashMultiset.create()).add(BallotBoxPlatformClient.options.get(option));
             }
         }));
-        feedback.accept(Text.literal("[BallotBox] ").formatted(Formatting.GREEN).append(Text.literal("%d players have submitted %d votes so far!".formatted(BallotBox.STATE.selections().size(), votes.size())).formatted(Formatting.AQUA)));
+        feedback.accept(Text.literal("[BallotBox] ").formatted(Formatting.GREEN).append(Text.literal("%d players have submitted %d votes so far!".formatted(BallotBox.STATE.selections().size(), votes.values().stream().mapToInt(Multiset::size).sum())).formatted(Formatting.AQUA)));
         votes.forEach((category, options) -> {
             feedback.accept(Text.literal("[BallotBox] ").formatted(Formatting.GREEN).append(Text.literal("--- Top %d for %s ---".formatted(BallotBox.CONFIG.awardLimit.value(), category.name())).formatted(Formatting.LIGHT_PURPLE)));
             int i = 0;
@@ -74,7 +74,7 @@ private static int votes(ServerPlayerEntity player, String ignored, Consumer<Tex
             }
         });
         feedback.accept(Text.literal("[BallotBox] ").formatted(Formatting.GREEN).append(Text.literal("--- End Votes ---").formatted(Formatting.AQUA)));
-        return votes.size();
+        return 0;
     }
 
     private static int vote(ServerPlayerEntity player, String ignored, Consumer<Text> feedback) {