From 8439838328e78804aed62c80f2c672616ad04c44 Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Tue, 26 Aug 2014 19:01:59 -0500 Subject: [PATCH 1/2] After years of research and experimenting, we settled on an achievement icon --- .../mineplex/core/achievement/ui/page/AchievementPage.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/page/AchievementPage.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/page/AchievementPage.java index 30054bcc5..0615dd7b4 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/page/AchievementPage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/page/AchievementPage.java @@ -70,7 +70,7 @@ public class AchievementPage extends ShopPageBase Date: Tue, 26 Aug 2014 20:27:39 -0400 Subject: [PATCH 2/2] Fixed SheepGame Selfish achievement --- .../arcade/game/games/sheep/SheepGame.java | 20 ++++++------------- .../arcade/stats/ParalympicsStatTracker.java | 2 +- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/SheepGame.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/SheepGame.java index 780c9155b..9b8361bab 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/SheepGame.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/SheepGame.java @@ -518,15 +518,7 @@ public class SheepGame extends TeamGame //Write New for (GameTeam team : _sheepPens.keySet()) { - int score = 0; - - for (Sheep sheep : _sheep.keySet()) - { - if (_sheepPens.get(team).contains(sheep.getLocation().getBlock())) - { - score++; - } - } + int score = getSheepCount(team); Scoreboard.WriteOrdered("Sheep", team.GetColor() + team.GetName(), score, true); @@ -682,14 +674,14 @@ public class SheepGame extends TeamGame public int getSheepCount(GameTeam team) { - int count = 0; + int score = 0; - for (SheepData data : _sheep.values()) + for (Sheep sheep : _sheep.keySet()) { - if (data.HolderTeam == team) - count++; + if (_sheepPens.get(team).contains(sheep.getLocation().getBlock())) + score++; } - return count; + return score; } } 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 acbda896a..11ced4a3f 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 @@ -23,7 +23,7 @@ public class ParalympicsStatTracker extends StatTracker } @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR) - public void onePerkLeap(PerkLeapEvent event) + public void onPerkLeap(PerkLeapEvent event) { if (getGame().GetState() != Game.GameState.Live) return;