diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/gamesummary/components/ExperienceSummaryComponent.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/gamesummary/components/ExperienceSummaryComponent.java index 8a19db7b0..16bdbd955 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/gamesummary/components/ExperienceSummaryComponent.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/gamesummary/components/ExperienceSummaryComponent.java @@ -30,6 +30,11 @@ public class ExperienceSummaryComponent extends GameSummaryComponent data) { + if (data.getLeft() == null) + { + return null; + } + return C.cGray + "+" + C.cYellow + data.getLeft().Amount + C.cGray + " Experience"; } @@ -37,6 +42,12 @@ public class ExperienceSummaryComponent extends GameSummaryComponent getHoverText(Pair data) { AchievementData achievementData = data.getRight(); + + if (achievementData == null) + { + return null; + } + List text = new ArrayList<>(2); text.add(C.cGray + "You are level " + C.cGreen + achievementData.getLevel()); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/winstreak/WinStreakModule.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/winstreak/WinStreakModule.java index 3882b2a15..1d40d1dd1 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/winstreak/WinStreakModule.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/winstreak/WinStreakModule.java @@ -1,5 +1,7 @@ package nautilus.game.arcade.game.modules.winstreak; +import java.util.List; + import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -40,7 +42,14 @@ public class WinStreakModule extends Module return; } - getGame().getWinners().forEach(this::incrementStreak); + List winners = getGame().getWinners(); + + if (winners == null) + { + return; + } + + winners.forEach(this::incrementStreak); } @EventHandler(priority = EventPriority.MONITOR)