diff --git a/src/main/java/de/fanta/challengesjoinentities/commands/ChallengesCommand/ChallengesStatsCommand.java b/src/main/java/de/fanta/challengesjoinentities/commands/ChallengesCommand/ChallengesStatsCommand.java index c3a0a02..ce702d9 100644 --- a/src/main/java/de/fanta/challengesjoinentities/commands/ChallengesCommand/ChallengesStatsCommand.java +++ b/src/main/java/de/fanta/challengesjoinentities/commands/ChallengesCommand/ChallengesStatsCommand.java @@ -60,7 +60,7 @@ ChatUtil.sendNormalMessage(sender, ChatUtil.ORANGE + " Speedruns gewonnen: " + ChatUtil.GREEN + (data.getRunsWon() < 0 ? "-" : data.getRunsWon()) + " (Dieser Monat: " + runsWonThisMonth + ")"); } - int positionThisMonth = data.getRunsWonMonth(); + int positionThisMonth = data.getPositionMonth(); if (bestTimeThisMonth < 0) { ChatUtil.sendNormalMessage(sender, ChatUtil.ORANGE + " Position: " + ChatUtil.GREEN + data.getPosition()); } else { diff --git a/src/main/java/de/fanta/challengesjoinentities/utils/Statistics.java b/src/main/java/de/fanta/challengesjoinentities/utils/Statistics.java index bf3763c..d977d20 100644 --- a/src/main/java/de/fanta/challengesjoinentities/utils/Statistics.java +++ b/src/main/java/de/fanta/challengesjoinentities/utils/Statistics.java @@ -98,8 +98,8 @@ keys.add(kBestTime = new PlayerStatisticsQueryKey(ps, speedRunsTimeSolo, PlayerStatisticsQueryKey.QueryType.SCORE)); keys.add(kBestTimeMonth = new PlayerStatisticsQueryKey(ps, speedRunsTimeSolo, PlayerStatisticsQueryKey.QueryType.SCORE, TimeFrame.MONTH)); - keys.add(kPosition = new PlayerStatisticsQueryKey(ps, speedRunsTimeSolo, PlayerStatisticsQueryKey.QueryType.POSITION_MAX)); - keys.add(kPositionMonth = new PlayerStatisticsQueryKey(ps, speedRunsTimeSolo, PlayerStatisticsQueryKey.QueryType.POSITION_MAX, TimeFrame.MONTH)); + keys.add(kPosition = new PlayerStatisticsQueryKey(ps, speedRunsTimeSolo, PlayerStatisticsQueryKey.QueryType.POSITION_MIN)); + keys.add(kPositionMonth = new PlayerStatisticsQueryKey(ps, speedRunsTimeSolo, PlayerStatisticsQueryKey.QueryType.POSITION_MIN, TimeFrame.MONTH)); } else if (statType == StatType.DUO) { keys.add(kRunsPlayed = new PlayerStatisticsQueryKey(ps, speedRunsPlayedDuo, PlayerStatisticsQueryKey.QueryType.SCORE)); keys.add(kRunsPlayedMonth = new PlayerStatisticsQueryKey(ps, speedRunsPlayedDuo, PlayerStatisticsQueryKey.QueryType.SCORE, TimeFrame.MONTH)); @@ -110,8 +110,8 @@ keys.add(kBestTime = new PlayerStatisticsQueryKey(ps, speedRunsTimeDuo, PlayerStatisticsQueryKey.QueryType.SCORE)); keys.add(kBestTimeMonth = new PlayerStatisticsQueryKey(ps, speedRunsTimeDuo, PlayerStatisticsQueryKey.QueryType.SCORE, TimeFrame.MONTH)); - keys.add(kPosition = new PlayerStatisticsQueryKey(ps, speedRunsTimeDuo, PlayerStatisticsQueryKey.QueryType.POSITION_MAX)); - keys.add(kPositionMonth = new PlayerStatisticsQueryKey(ps, speedRunsTimeDuo, PlayerStatisticsQueryKey.QueryType.POSITION_MAX, TimeFrame.MONTH)); + keys.add(kPosition = new PlayerStatisticsQueryKey(ps, speedRunsTimeDuo, PlayerStatisticsQueryKey.QueryType.POSITION_MIN)); + keys.add(kPositionMonth = new PlayerStatisticsQueryKey(ps, speedRunsTimeDuo, PlayerStatisticsQueryKey.QueryType.POSITION_MIN, TimeFrame.MONTH)); } else if (statType == StatType.TEAM) { keys.add(kRunsPlayed = new PlayerStatisticsQueryKey(ps, speedRunsPlayedTeam, PlayerStatisticsQueryKey.QueryType.SCORE)); keys.add(kRunsPlayedMonth = new PlayerStatisticsQueryKey(ps, speedRunsPlayedTeam, PlayerStatisticsQueryKey.QueryType.SCORE, TimeFrame.MONTH)); @@ -122,8 +122,8 @@ keys.add(kBestTime = new PlayerStatisticsQueryKey(ps, speedRunsTimeTeam, PlayerStatisticsQueryKey.QueryType.SCORE)); keys.add(kBestTimeMonth = new PlayerStatisticsQueryKey(ps, speedRunsTimeTeam, PlayerStatisticsQueryKey.QueryType.SCORE, TimeFrame.MONTH)); - keys.add(kPosition = new PlayerStatisticsQueryKey(ps, speedRunsTimeTeam, PlayerStatisticsQueryKey.QueryType.POSITION_MAX)); - keys.add(kPositionMonth = new PlayerStatisticsQueryKey(ps, speedRunsTimeTeam, PlayerStatisticsQueryKey.QueryType.POSITION_MAX, TimeFrame.MONTH)); + keys.add(kPosition = new PlayerStatisticsQueryKey(ps, speedRunsTimeTeam, PlayerStatisticsQueryKey.QueryType.POSITION_MIN)); + keys.add(kPositionMonth = new PlayerStatisticsQueryKey(ps, speedRunsTimeTeam, PlayerStatisticsQueryKey.QueryType.POSITION_MIN, TimeFrame.MONTH)); } PlayerStatisticsQueryKey finalKRunsPlayed = kRunsPlayed; @@ -139,17 +139,17 @@ PlayerStatisticsQueryKey finalKPositionMonth = kPositionMonth; statistics.queryStats(keys, (c) -> { - int runsPlayed = c.getOrDefault(finalKRunsPlayed, 0); - int runsPlayedMonth = c.getOrDefault(finalKRunsPlayedMonth, 0); + Integer runsPlayed = c.getOrDefault(finalKRunsPlayed, 0); + Integer runsPlayedMonth = c.getOrDefault(finalKRunsPlayedMonth, 0); - int runsWon = c.getOrDefault(finalKRunsWon, 0); - int runsWonMonth = c.getOrDefault(finalKRunsWonMonth, 0); + Integer runsWon = c.getOrDefault(finalKRunsWon, 0); + Integer runsWonMonth = c.getOrDefault(finalKRunsWonMonth, 0); - int bestTime = c.getOrDefault(finalKBestTime, 0); - int bestTimeMonth = c.getOrDefault(finalKBestTimeMonth, 0); + Integer bestTime = c.getOrDefault(finalKBestTime, 0); + Integer bestTimeMonth = c.getOrDefault(finalKBestTimeMonth, 0); - int position = c.getOrDefault(finalKPosition, -1); - int positionMonth = c.getOrDefault(finalKPositionMonth, -1); + Integer position = c.getOrDefault(finalKPosition, -1); + Integer positionMonth = c.getOrDefault(finalKPositionMonth, -1); callback.accept(new PlayerStatisticsData(player.getUniqueId(), player.getName(), runsPlayed, runsPlayedMonth, runsWon, runsWonMonth, bestTime, bestTimeMonth, position, positionMonth)); });