Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public static class Guild {
private List<Member> members;
private List<Rank> ranks;
private List<GameType> preferredGames;
private Map<GameType, Integer> guildExpByGameType;
private Map<GameType, Long> guildExpByGameType;
private Map<GuildAchievement, Integer> achievements;
private int coins;
private int coinsEver;
Expand Down Expand Up @@ -202,14 +202,14 @@ public List<GameType> getPreferredGames() {
* @return the amount of XP earned by the guild for the specified {@code game}.
* @throws IllegalArgumentException if the provided {@code game} is {@code null}.
*/
public int getExperienceForGame(GameType game) {
public long getExperienceForGame(GameType game) {
if (game == null) {
throw new IllegalArgumentException("Cannot get XP for null GameType");
}

return Optional.ofNullable(guildExpByGameType)
.map(expByGame -> expByGame.get(game))
.orElse(0);
.orElse(0L);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ private static void printGuildXpPerGame(Guild guild) {
* Then we loop through each game and see how much experience the guild's earned from it.
*/
for (GameType game : GameType.values()) {
int experienceForGame = guild.getExperienceForGame(game);
long experienceForGame = guild.getExperienceForGame(game);
System.out.println("\t" + game.getName() + ": " + experienceForGame);
}
}
Expand Down