From 39b46bc8f5b4a3430be9c2d5e32e60db5912cab0 Mon Sep 17 00:00:00 2001 From: CoderTim Date: Wed, 3 Sep 2014 16:53:29 -0400 Subject: [PATCH] Fixed some NPEs --- .../game/arcade/stats/ParalympicsStatTracker.java | 9 ++++++--- .../game/arcade/stats/SharpShooterStatTracker.java | 2 +- .../game/arcade/stats/TheComebackStatTracker.java | 7 +++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ParalympicsStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ParalympicsStatTracker.java index 11ced4a3f..1ccd38060 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ParalympicsStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ParalympicsStatTracker.java @@ -38,10 +38,13 @@ public class ParalympicsStatTracker extends StatTracker { List winners = getGame().getWinners(); - for (Player winner : winners) + if (winners != null) { - if (!_hasLeaped.contains(winner.getUniqueId())) - addStat(winner, "Paralympics", 1, true, false); + for (Player winner : winners) + { + if (!_hasLeaped.contains(winner.getUniqueId())) + addStat(winner, "Paralympics", 1, true, false); + } } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SharpShooterStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SharpShooterStatTracker.java index bd447e27b..95cd038fa 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SharpShooterStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SharpShooterStatTracker.java @@ -32,7 +32,7 @@ public class SharpShooterStatTracker extends StatTracker if (event.getEntity().getShooter() instanceof Player && event.getEntity() instanceof Arrow) { - Player player = (Player) event.getEntity(); + Player player = (Player) event.getEntity().getShooter(); Integer count = _arrowsShot.get(player.getUniqueId()); count = (count == null ? 0 : count) + 1; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TheComebackStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TheComebackStatTracker.java index 5c07783ab..36346e496 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TheComebackStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TheComebackStatTracker.java @@ -46,8 +46,11 @@ public class TheComebackStatTracker extends StatTracker { if (_hasWentFiveOrBelow.contains(getGame().WinnerTeam)) { - for (Player player : getGame().getWinners()) - addStat(player, "TheComeback", 1, true, false); + if (getGame().getWinners() != null) + { + for (Player player : getGame().getWinners()) + addStat(player, "TheComeback", 1, true, false); + } } } }