CraftAttack/spawn
4
0
Fork 0
Code Issues 3 Pull Requests 1 Packages Projects Releases Wiki Activity

added null value check for material

Browse Source
This commit is contained in:
Lars Neuhaus
2025-11-07 21:27:33 +01:00
parent b4ccc3c4c8
commit 62c0250049
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/statistics/Statistics.java
View File

@@ -8,15 +8,14 @@ import org.bukkit.Material;
import org.bukkit.Statistic; import org.bukkit.Statistic;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
public class Statistics extends Appliance { public class Statistics extends Appliance {
record StatisticsResponse(List<PlayerStatistics> playerStatistics) { record StatisticsResponse(List<PlayerStatistics> playerStatistics) {
record PlayerStatistics(String player, Map<MaterialStatistic, Integer> values) { record PlayerStatistics(String player, List<MaterialStatistic> statistics) {
} }
} }
record MaterialStatistic(String name, String material) { record MaterialStatistic(String name, String material, int value) {
} }
record StatisticsRequest(List<MaterialStatistic> categories) { record StatisticsRequest(List<MaterialStatistic> categories) {
@@ -34,14 +33,14 @@ public class Statistics extends Appliance {
.map(player -> new StatisticsResponse.PlayerStatistics( .map(player -> new StatisticsResponse.PlayerStatistics(
player.getUniqueId().toString(), player.getUniqueId().toString(),
statistics.categories().stream() statistics.categories().stream()
.map(s -> new AbstractMap.SimpleEntry<>(s, s.material().isBlank() .map(category -> {
? player.getStatistic(Statistic.valueOf(s.name)) String material = (category.material() == null || category.material().isBlank()) ? null : category.material();
: player.getStatistic(Statistic.valueOf(s.name), Material.valueOf(s.material())) return new MaterialStatistic(category.name(), material, material == null
)) ? player.getStatistic(Statistic.valueOf(category.name()))
.collect(Collectors.toMap( : player.getStatistic(Statistic.valueOf(category.name()), Material.valueOf(material))
Map.Entry::getKey, );
Map.Entry::getValue })
)) .toList()
)) ))
.toList(); .toList();
return new StatisticsResponse(statisticsList); return new StatisticsResponse(statisticsList);